mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-28 12:30:42 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* 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.
This commit is contained in:
Oleg Pudeyev
2011-04-10 19:52:58 -04:00
parent 2d3dcd43c5 bdb84452f5
commit 00a69b4372
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/includes/functions_user.php
View File

@@ -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;
} }

6
phpBB/language/en/acp/posting.php
View File

@@ -168,9 +168,9 @@ $lang = array_merge($lang, array(
'SMILIES_CONFIG' => 'Smiley configuration', 'SMILIES_CONFIG' => 'Smiley configuration',
'SMILIES_DELETED' => 'The smiley has been removed successfully.', 'SMILIES_DELETED' => 'The smiley has been removed successfully.',
'SMILIES_EDIT' => 'Edit smiley', 'SMILIES_EDIT' => 'Edit smiley',
'SMILIE_NO_CODE' => 'The smilie “%s” was ignored, as there was no code entered.', 'SMILIE_NO_CODE' => 'The smiley “%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_EMOTION' => 'The smiley “%s” was ignored, as there was no emotion entered.',
'SMILIE_NO_FILE' => 'The smilie “%s” was ignored, as the file is missing.', 'SMILIE_NO_FILE' => 'The smiley “%s” was ignored, as the file is missing.',
'SMILIES_NONE_EDITED' => 'No smilies were updated.', 'SMILIES_NONE_EDITED' => 'No smilies were updated.',
'SMILIES_ONE_EDITED' => 'The smiley has been updated successfully.', 'SMILIES_ONE_EDITED' => 'The smiley has been updated successfully.',
'SMILIES_EDITED' => 'The smilies have been updated successfully.', 'SMILIES_EDITED' => 'The smilies have been updated successfully.',