diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-04-08 12:24:59 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-04-08 12:24:59 +0200 |
| commit | 8a54d8850932a22c9d808973572b29d82a7a2dd2 (patch) | |
| tree | 55ec6e3ee0aad4d4259ef302e0edfb34e5deac83 /phpBB | |
| parent | 7074d19c4087fab0e81a31bd806724d7eac7ef87 (diff) | |
| parent | c910ce1cc6763bd31e7be6548f86b5c571c725c5 (diff) | |
| download | forums-8a54d8850932a22c9d808973572b29d82a7a2dd2.tar forums-8a54d8850932a22c9d808973572b29d82a7a2dd2.tar.gz forums-8a54d8850932a22c9d808973572b29d82a7a2dd2.tar.bz2 forums-8a54d8850932a22c9d808973572b29d82a7a2dd2.tar.xz forums-8a54d8850932a22c9d808973572b29d82a7a2dd2.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10084] Add smilie/icon errors out when file is missing
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_icons.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/acp/posting.php | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index a525efb510..c848039c66 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -395,6 +395,10 @@ class acp_icons { // skip images where add wasn't checked } + else if (!file_exists($phpbb_root_path . $img_path . '/' . $image)) + { + $errors[$image] = 'SMILIE_NO_FILE'; + } else { if ($image_width[$image] == 0 || $image_height[$image] == 0) diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index df573eb853..dfd2dd5f6e 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -168,8 +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_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.', 'SMILIES_NONE_EDITED' => 'No smilies were updated.', 'SMILIES_ONE_EDITED' => 'The smiley has been updated successfully.', 'SMILIES_EDITED' => 'The smilies have been updated successfully.', |