diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-04-10 19:52:06 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-04-10 19:52:06 -0400 |
| commit | bdb84452f55bb1f71fc7ddfd913715dcde5703eb (patch) | |
| tree | 4e92bc7e8c7d4a9f590f29c8c9917bd00ee9abf4 /phpBB/includes/functions_user.php | |
| parent | 5f05899588882bfa63c29d5548b2be1aa71e5b3a (diff) | |
| parent | 259929ad4e7e0c527f652e3bff1db48e7533fd08 (diff) | |
| download | forums-bdb84452f55bb1f71fc7ddfd913715dcde5703eb.tar forums-bdb84452f55bb1f71fc7ddfd913715dcde5703eb.tar.gz forums-bdb84452f55bb1f71fc7ddfd913715dcde5703eb.tar.bz2 forums-bdb84452f55bb1f71fc7ddfd913715dcde5703eb.tar.xz forums-bdb84452f55bb1f71fc7ddfd913715dcde5703eb.zip | |
Merge branch 'ticket/bantu/10128' into develop-olympus
* ticket/bantu/10128:
[ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 89ce52dc39..6b5cca8abb 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -733,7 +733,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas } 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 if (!sizeof($sql_usernames)) { - trigger_error('NO_USER_SPECIFIED'); + trigger_error('NO_USER_SPECIFIED', E_USER_WARNING); } $sql = 'SELECT user_id @@ -824,7 +824,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas else { $db->sql_freeresult($result); - trigger_error('NO_USERS'); + trigger_error('NO_USERS', E_USER_WARNING); } $db->sql_freeresult($result); break; @@ -926,7 +926,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas if (empty($banlist_ary)) { - trigger_error('NO_IPS_DEFINED'); + trigger_error('NO_IPS_DEFINED', E_USER_WARNING); } } break; @@ -954,12 +954,12 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas if (sizeof($ban_list) == 0) { - trigger_error('NO_EMAILS_DEFINED'); + trigger_error('NO_EMAILS_DEFINED', E_USER_WARNING); } break; default: - trigger_error('NO_MODE'); + trigger_error('NO_MODE', E_USER_WARNING); break; } |