diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-10-02 17:18:22 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-10-02 17:18:22 +0200 |
| commit | 6b798d02fbe8fb3fcb2067856fe27ba737fe7650 (patch) | |
| tree | c2a33a843731d2d09ff13dbe023e7192d38ea290 /phpBB/includes/acp/acp_database.php | |
| parent | 165e0edb2a41801a278ab00673f730e33192615a (diff) | |
| parent | cd4190a72d48ec1c8faed96fb73408c8a8f1f302 (diff) | |
| download | forums-6b798d02fbe8fb3fcb2067856fe27ba737fe7650.tar forums-6b798d02fbe8fb3fcb2067856fe27ba737fe7650.tar.gz forums-6b798d02fbe8fb3fcb2067856fe27ba737fe7650.tar.bz2 forums-6b798d02fbe8fb3fcb2067856fe27ba737fe7650.tar.xz forums-6b798d02fbe8fb3fcb2067856fe27ba737fe7650.zip | |
Merge branch 'prep-release-3.1.10' into 3.1.x
* prep-release-3.1.10:
[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 16655ff4cb..dd0599e06a 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -42,11 +42,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 )); @@ -70,6 +65,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') |