From 2cc2ae1eacbdce375be36d9abbe6af37cefabb5d Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Tue, 20 Nov 2001 14:48:42 +0000 Subject: [PATCH] Likely fix for bug #482308 git-svn-id: file:///svn/phpbb/trunk@1388 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/admin/admin_smilies.php | 6 ++++-- 1 file 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; }