mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 03:54:10 +01:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/10084] Add smilie/icon errors out when file is missing
This commit is contained in:
Andreas Fischer 2011-04-08 12:24:59 +02:00
commit 8a54d88509
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/acp/acp_icons.php
View File

@ -395,6 +395,10 @@ class acp_icons
{ {
// skip images where add wasn't checked // skip images where add wasn't checked
} }
else if (!file_exists($phpbb_root_path . $img_path . '/' . $image))
{
$errors[$image] = 'SMILIE_NO_FILE';
}
else else
{ {
if ($image_width[$image] == 0 || $image_height[$image] == 0) if ($image_width[$image] == 0 || $image_height[$image] == 0)

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

@ -168,8 +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 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_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.',
'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.',