aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2013-02-24 18:05:22 +0100
committerNils Adermann <naderman@naderman.de>2013-02-24 18:05:22 +0100
commit65118218c75d92beaee299985bdf003cb62628e9 (patch)
treec7696f332ca3f4f4806bdabc4840c40ce1842def
parent639110766caf40235768d8eed992745a9ab294b0 (diff)
parentab530a999ed64a2e1fcc10252bdae6d9139d7538 (diff)
downloadforums-65118218c75d92beaee299985bdf003cb62628e9.tar
forums-65118218c75d92beaee299985bdf003cb62628e9.tar.gz
forums-65118218c75d92beaee299985bdf003cb62628e9.tar.bz2
forums-65118218c75d92beaee299985bdf003cb62628e9.tar.xz
forums-65118218c75d92beaee299985bdf003cb62628e9.zip
Merge branch 'ticket/11355' into develop-olympus
* ticket/11355: [ticket/11355] Referred proper variable when validating selection. [ticket/11355] Wrong error message when no user is selected.
-rw-r--r--phpBB/includes/acp/acp_groups.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 486616c33d..bbe85f8038 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -179,6 +179,10 @@ class acp_groups
break;
case 'deleteusers':
+ if (empty($mark_ary))
+ {
+ trigger_error($user->lang['NO_USERS'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id), E_USER_WARNING);
+ }
case 'delete':
if (!$group_id)
{
@@ -795,4 +799,4 @@ class acp_groups
}
}
-?> \ No newline at end of file
+?>