mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-30 02:59:29 +02:00
Code Issues Releases Wiki Activity

Merge branch 'ticket/bantu/10128' into develop-olympus

Browse Source 
* ticket/bantu/10128:
  [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().
This commit is contained in:
Oleg Pudeyev 2011-04-10 19:52:06 -04:00
commit bdb84452f5
1 changed files with 6 additions and 6 deletions

12
phpBB/includes/functions_user.php

@ -733,7 +733,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
} }
else else
{ {
trigger_error('LENGTH_BAN_INVALID'); trigger_error('LENGTH_BAN_INVALID', E_USER_WARNING);
} }
} }
} }
@ -793,7 +793,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
// Make sure we have been given someone to ban // Make sure we have been given someone to ban
if (!sizeof($sql_usernames)) if (!sizeof($sql_usernames))
{ {
trigger_error('NO_USER_SPECIFIED'); trigger_error('NO_USER_SPECIFIED', E_USER_WARNING);
} }
$sql = 'SELECT user_id $sql = 'SELECT user_id
@ -824,7 +824,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
else else
{ {
$db->sql_freeresult($result); $db->sql_freeresult($result);
trigger_error('NO_USERS'); trigger_error('NO_USERS', E_USER_WARNING);
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
break; break;
@ -926,7 +926,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
if (empty($banlist_ary)) if (empty($banlist_ary))
{ {
trigger_error('NO_IPS_DEFINED'); trigger_error('NO_IPS_DEFINED', E_USER_WARNING);
} }
} }
break; break;
@ -954,12 +954,12 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
if (sizeof($ban_list) == 0) if (sizeof($ban_list) == 0)
{ {
trigger_error('NO_EMAILS_DEFINED'); trigger_error('NO_EMAILS_DEFINED', E_USER_WARNING);
} }
break; break;
default: default:
trigger_error('NO_MODE'); trigger_error('NO_MODE', E_USER_WARNING);
break; break;
} }