diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-20 14:48:42 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-20 14:48:42 +0000 |
| commit | 2cc2ae1eacbdce375be36d9abbe6af37cefabb5d (patch) | |
| tree | 55aba6be5d19cc34c85ec49486cdc42cf4141395 /phpBB/admin | |
| parent | 143823685e30aa07d5afc7134597fe98015e3149 (diff) | |
| download | forums-2cc2ae1eacbdce375be36d9abbe6af37cefabb5d.tar forums-2cc2ae1eacbdce375be36d9abbe6af37cefabb5d.tar.gz forums-2cc2ae1eacbdce375be36d9abbe6af37cefabb5d.tar.bz2 forums-2cc2ae1eacbdce375be36d9abbe6af37cefabb5d.tar.xz forums-2cc2ae1eacbdce375be36d9abbe6af37cefabb5d.zip | |
Likely fix for bug #482308
git-svn-id: file:///svn/phpbb/trunk@1388 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/admin')
| -rw-r--r-- | phpBB/admin/admin_smilies.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/admin/admin_smilies.php b/phpBB/admin/admin_smilies.php index d48474b22d..f19f340292 100644 --- a/phpBB/admin/admin_smilies.php +++ b/phpBB/admin/admin_smilies.php @@ -72,11 +72,13 @@ while($file = @readdir($dir)) { if( !@is_dir($phpbb_root_path . $board_config['smilies_path'] . '/' . $file) ) { - if( !is_null(@getimagesize($phpbb_root_path . $board_config['smilies_path'] . '/' . $file)) ) + $img_size = @getimagesize($phpbb_root_path . $board_config['smilies_path'] . '/' . $file); + + if( $img_size[0] && $img_size[1] ) { $smiley_images[] = $file; } - elseif(eregi('.pak$', $file) ) + else if( eregi('.pak$', $file) ) { $smiley_paks[] = $file; } |