aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2011-04-07 20:36:11 +0200
committerJoas Schilling <nickvergessen@gmx.de>2011-04-07 20:36:11 +0200
commit851bb9fcd869b71140f75ed3a454ade2447c1328 (patch)
treecb625cf4e91eb41822c2dec53c312ae3da715f5a /phpBB/includes
parentdf622a1fab35f4b654f48237799d2fa4164dc3be (diff)
downloadforums-851bb9fcd869b71140f75ed3a454ade2447c1328.tar
forums-851bb9fcd869b71140f75ed3a454ade2447c1328.tar.gz
forums-851bb9fcd869b71140f75ed3a454ade2447c1328.tar.bz2
forums-851bb9fcd869b71140f75ed3a454ade2447c1328.tar.xz
forums-851bb9fcd869b71140f75ed3a454ade2447c1328.zip
[ticket/10084] Add smilie/icon errors out when file is missing
PHPBB3-10084
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_icons.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php
index 3d64a2acda..24f6cbbcbf 100644
--- a/phpBB/includes/acp/acp_icons.php
+++ b/phpBB/includes/acp/acp_icons.php
@@ -394,6 +394,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)