diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2016-01-09 18:42:07 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2016-01-09 18:42:07 +0100 |
| commit | fd5e66cbf11ac3e49007369ece339bc937517d93 (patch) | |
| tree | b625c33c00c30ce65d72c79f9b3fc68f5c8f038a /phpBB/includes/acp/acp_bbcodes.php | |
| parent | d64680983a5fa06a737a1ae7e164cb7f67a5a53c (diff) | |
| parent | 85e98a9d702cf179dc09a6ad077fac23bb28ae38 (diff) | |
| download | forums-fd5e66cbf11ac3e49007369ece339bc937517d93.tar forums-fd5e66cbf11ac3e49007369ece339bc937517d93.tar.gz forums-fd5e66cbf11ac3e49007369ece339bc937517d93.tar.bz2 forums-fd5e66cbf11ac3e49007369ece339bc937517d93.tar.xz forums-fd5e66cbf11ac3e49007369ece339bc937517d93.zip | |
Merge branch 'prep-release-3.1.7' into 3.1.x
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
Diffstat (limited to 'phpBB/includes/acp/acp_bbcodes.php')
| -rw-r--r-- | phpBB/includes/acp/acp_bbcodes.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index e245eea069..35ac33882e 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -33,6 +33,7 @@ class acp_bbcodes // Set up general vars $action = request_var('action', ''); $bbcode_id = request_var('bbcode', 0); + $submit = $request->is_set_post('submit'); $this->tpl_name = 'acp_bbcodes'; $this->page_title = 'ACP_BBCODES'; @@ -40,6 +41,11 @@ class acp_bbcodes 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); + } + // Set up mode-specific vars switch ($action) { |