diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-02-24 18:07:29 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-02-24 18:07:29 +0100 |
| commit | b964d175645041d6d88e8fc36c99d58abfbfd97e (patch) | |
| tree | 71a93d155427adccc7d971a4b7e1ce264a395331 | |
| parent | e2046444a17473eefe68a67d26a34cd25e3872b5 (diff) | |
| parent | 65118218c75d92beaee299985bdf003cb62628e9 (diff) | |
| download | forums-b964d175645041d6d88e8fc36c99d58abfbfd97e.tar forums-b964d175645041d6d88e8fc36c99d58abfbfd97e.tar.gz forums-b964d175645041d6d88e8fc36c99d58abfbfd97e.tar.bz2 forums-b964d175645041d6d88e8fc36c99d58abfbfd97e.tar.xz forums-b964d175645041d6d88e8fc36c99d58abfbfd97e.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11355] Referred proper variable when validating selection.
[ticket/11355] Wrong error message when no user is selected.
Conflicts:
phpBB/includes/acp/acp_groups.php
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index 9145a20400..a52ba593e7 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -185,6 +185,10 @@ class acp_groups break; case 'deleteusers': + if (empty($mark_ary)) + { + trigger_error($user->lang['NO_USERS'] . adm_back_link($this->u_action . '&action=list&g=' . $group_id), E_USER_WARNING); + } case 'delete': if (!$group_id) { |