diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-04-10 19:52:58 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-04-10 19:52:58 -0400 |
| commit | 00a69b43723b89a90bc59763a1cdae9a7001a153 (patch) | |
| tree | 8b4c09e4392c091164dceaaa0a7800f496653a92 | |
| parent | 2d3dcd43c58fe2e28fafcb6738e45c8632b2ff28 (diff) | |
| parent | bdb84452f55bb1f71fc7ddfd913715dcde5703eb (diff) | |
| download | forums-00a69b43723b89a90bc59763a1cdae9a7001a153.tar forums-00a69b43723b89a90bc59763a1cdae9a7001a153.tar.gz forums-00a69b43723b89a90bc59763a1cdae9a7001a153.tar.bz2 forums-00a69b43723b89a90bc59763a1cdae9a7001a153.tar.xz forums-00a69b43723b89a90bc59763a1cdae9a7001a153.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().
[ticket/10123] Change "smilie" to "smiley" as per our coding guidelines.
| -rw-r--r-- | phpBB/includes/functions_user.php | 12 | ||||
| -rw-r--r-- | phpBB/language/en/acp/posting.php | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 81d06344af..124aac18be 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; } diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index dfd2dd5f6e..16e1aaca66 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -168,9 +168,9 @@ $lang = array_merge($lang, array( 'SMILIES_CONFIG' => 'Smiley configuration', 'SMILIES_DELETED' => 'The smiley has been removed successfully.', 'SMILIES_EDIT' => 'Edit smiley', - 'SMILIE_NO_CODE' => 'The smilie “%s” was ignored, as there was no code entered.', - 'SMILIE_NO_EMOTION' => 'The smilie “%s” was ignored, as there was no emotion entered.', - 'SMILIE_NO_FILE' => 'The smilie “%s” was ignored, as the file is missing.', + 'SMILIE_NO_CODE' => 'The smiley “%s” was ignored, as there was no code entered.', + 'SMILIE_NO_EMOTION' => 'The smiley “%s” was ignored, as there was no emotion entered.', + 'SMILIE_NO_FILE' => 'The smiley “%s” was ignored, as the file is missing.', 'SMILIES_NONE_EDITED' => 'No smilies were updated.', 'SMILIES_ONE_EDITED' => 'The smiley has been updated successfully.', 'SMILIES_EDITED' => 'The smilies have been updated successfully.', |