diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-04-08 12:23:24 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-04-08 12:23:24 +0200 |
| commit | c910ce1cc6763bd31e7be6548f86b5c571c725c5 (patch) | |
| tree | cb625cf4e91eb41822c2dec53c312ae3da715f5a /phpBB/includes/acp/acp_icons.php | |
| parent | df622a1fab35f4b654f48237799d2fa4164dc3be (diff) | |
| parent | 851bb9fcd869b71140f75ed3a454ade2447c1328 (diff) | |
| download | forums-c910ce1cc6763bd31e7be6548f86b5c571c725c5.tar forums-c910ce1cc6763bd31e7be6548f86b5c571c725c5.tar.gz forums-c910ce1cc6763bd31e7be6548f86b5c571c725c5.tar.bz2 forums-c910ce1cc6763bd31e7be6548f86b5c571c725c5.tar.xz forums-c910ce1cc6763bd31e7be6548f86b5c571c725c5.zip | |
Merge branch 'ticket/nickvergessen/10084' into develop-olympus
* ticket/nickvergessen/10084:
[ticket/10084] Add smilie/icon errors out when file is missing
Diffstat (limited to 'phpBB/includes/acp/acp_icons.php')
| -rw-r--r-- | phpBB/includes/acp/acp_icons.php | 4 |
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) |