makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15699] Fix messages

Browse source 
PHPBB3-15699
This commit is contained in:
Rubén Calvo 2018-08-01 21:24:45 +02:00 • committed by Ruben Calvo
parent 8cb5ea8e20
commit 9c51b3099a
No known key found for this signature in database
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/includes/acp/acp_storage.php
View file

@ -153,7 +153,7 @@ class acp_storage
break; break;
} }
if (!check_form_key($form_key) || !check_link_hash($this->request->variable('hash', ''), 'acp_storage')) if (!check_link_hash($this->request->variable('hash', ''), 'acp_storage'))
{ {
trigger_error($this->user->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING); trigger_error($this->user->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING);
} }
@ -163,8 +163,9 @@ class acp_storage
foreach ($this->state['storages'] as $storage_name => $storage_options) foreach ($this->state['storages'] as $storage_name => $storage_options)
{ {
// Skip storages that have already moved files // Skip storages that have already moved files
if ($this->state['storage_index'] > $i++) if ($this->state['storage_index'] > $i)
{ {
$i++;
continue; continue;
} }
@ -209,8 +210,9 @@ class acp_storage
foreach ($this->state['storages'] as $storage_name => $storage_options) foreach ($this->state['storages'] as $storage_name => $storage_options)
{ {
// Skip storages that have already moved files // Skip storages that have already moved files
if ($this->state['remove_storage_index'] > $i++) if ($this->state['remove_storage_index'] > $i)
{ {
$i++;
continue; continue;
} }

4
phpBB/language/en/acp/storage.php
View file

@ -54,8 +54,8 @@ $lang = array_merge($lang, array(
'START_UPDATING_EXPLAIN' => 'Start the storage update process', 'START_UPDATING_EXPLAIN' => 'Start the storage update process',
'CONTINUE_UPDATING' => 'Continue previous update process', 'CONTINUE_UPDATING' => 'Continue previous update process',
'CONTINUE_UPDATING_EXPLAIN' => 'An update process has been started. In order to access the storage settings page you will have to complete it or cancel it.', 'CONTINUE_UPDATING_EXPLAIN' => 'An update process has been started. In order to access the storage settings page you will have to complete it or cancel it.',
'SORAGE_UPDATE_REDIRECT' => 'Files of %s (%d/%d) are being moved.<br />', 'STORAGE_UPDATE_REDIRECT' => 'Files of %s (%d/%d) are being moved.<br />',
'SORAGE_UPDATE_REMOVE_REDIRECT' => 'Files of old %s (%d/%d) are being removed.<br />', 'STORAGE_UPDATE_REMOVE_REDIRECT' => 'Files of old %s (%d/%d) are being removed.<br />',
// Template progress bar // Template progress bar
'STORAGE_UPDATE_IN_PROGRESS' => 'Storage update in progress', 'STORAGE_UPDATE_IN_PROGRESS' => 'Storage update in progress',