makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 22:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* 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
This commit is contained in:
Nils Adermann 2013-02-24 18:07:29 +01:00
commit b964d17564
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/acp/acp_groups.php
View file

@ -185,6 +185,10 @@ class acp_groups
break; break;
case 'deleteusers': 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': case 'delete':
if (!$group_id) if (!$group_id)
{ {