aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-06-03 15:39:07 +0200
committerAndreas Fischer <bantu@phpbb.com>2013-06-03 15:39:07 +0200
commita20a0e06c2baecae807647cf953f920e3952b0e5 (patch)
tree233b518e9a0c12b7bd5027aa4a0246cbef1fa2dc
parentfe4f0ef42c3159945627fdc9b80e22b7a1161063 (diff)
parent1cd6bb88a67d4f304060850847bfaa4dc91b1149 (diff)
downloadforums-a20a0e06c2baecae807647cf953f920e3952b0e5.tar
forums-a20a0e06c2baecae807647cf953f920e3952b0e5.tar.gz
forums-a20a0e06c2baecae807647cf953f920e3952b0e5.tar.bz2
forums-a20a0e06c2baecae807647cf953f920e3952b0e5.tar.xz
forums-a20a0e06c2baecae807647cf953f920e3952b0e5.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10840] Add check_form_key to acp_groups.php
-rw-r--r--phpBB/includes/acp/acp_groups.php10
1 files changed, 10 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 246ba5709b..847ccfb3cc 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -87,6 +87,11 @@ class acp_groups
case 'approve':
case 'demote':
case 'promote':
+ if (!check_form_key($form_key))
+ {
+ trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+ }
+
if (!$group_id)
{
trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
@@ -259,6 +264,11 @@ class acp_groups
break;
case 'addusers':
+ if (!check_form_key($form_key))
+ {
+ trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+ }
+
if (!$group_id)
{
trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);