aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_bbcodes.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2016-01-09 18:45:32 +0100
committerJoas Schilling <nickvergessen@gmx.de>2016-01-09 18:45:32 +0100
commit7f7b09fdeb087ed826bf5216fa271f2dd65c52e6 (patch)
tree63a747494d59ce4dd2fbfb4742f2f90ac9b3790f /phpBB/includes/acp/acp_bbcodes.php
parentb2324607ad7d23450aafddbf6fb286fa05e3a9d5 (diff)
parentfd5e66cbf11ac3e49007369ece339bc937517d93 (diff)
downloadforums-7f7b09fdeb087ed826bf5216fa271f2dd65c52e6.tar
forums-7f7b09fdeb087ed826bf5216fa271f2dd65c52e6.tar.gz
forums-7f7b09fdeb087ed826bf5216fa271f2dd65c52e6.tar.bz2
forums-7f7b09fdeb087ed826bf5216fa271f2dd65c52e6.tar.xz
forums-7f7b09fdeb087ed826bf5216fa271f2dd65c52e6.zip
Merge branch '3.1.x'
Conflicts: build/build.xml phpBB/docs/CHANGELOG.html phpBB/includes/acp/acp_bbcodes.php
Diffstat (limited to 'phpBB/includes/acp/acp_bbcodes.php')
-rw-r--r--phpBB/includes/acp/acp_bbcodes.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index 114cba37f6..dab18289c7 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->variable('action', '');
$bbcode_id = $request->variable('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)
{