diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-10-02 17:18:32 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-10-02 17:18:32 +0200 |
| commit | 5075090d4fa4e3f8340f6f9d19851046122f6dc7 (patch) | |
| tree | f39bac8a5b2aa6cab0aa299063cc048d8b0c250e /phpBB/includes/acp/acp_database.php | |
| parent | 78333e300cc4a22c0211029d3490ff4c50b16294 (diff) | |
| parent | 6b798d02fbe8fb3fcb2067856fe27ba737fe7650 (diff) | |
| download | forums-5075090d4fa4e3f8340f6f9d19851046122f6dc7.tar forums-5075090d4fa4e3f8340f6f9d19851046122f6dc7.tar.gz forums-5075090d4fa4e3f8340f6f9d19851046122f6dc7.tar.bz2 forums-5075090d4fa4e3f8340f6f9d19851046122f6dc7.tar.xz forums-5075090d4fa4e3f8340f6f9d19851046122f6dc7.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14789] Remove obsolete check_form_key() and add missing hashes
[ticket/14789] Move form key checks to where they actually do something
Diffstat (limited to 'phpBB/includes/acp/acp_database.php')
| -rw-r--r-- | phpBB/includes/acp/acp_database.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index 364f5938e1..5e430e82ea 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -41,11 +41,6 @@ class acp_database $form_key = 'acp_database'; add_form_key($form_key); - if ($submit && !check_form_key($form_key)) - { - trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); - } - $template->assign_vars(array( 'MODE' => $mode )); @@ -69,6 +64,11 @@ class acp_database trigger_error($user->lang['TABLE_SELECT_ERROR'] . adm_back_link($this->u_action), E_USER_WARNING); } + if (!check_form_key($form_key)) + { + trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); + } + $store = $download = $structure = $schema_data = false; if ($where == 'store_and_download' || $where == 'store') |