[Phpbb-checkins] CVS: phpBB2/admin admin_smilies.php,1.15,1.16

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv7522/admin

Modified Files:
	admin_smilies.php 
Log Message:
Likely fix for bug #482308

Index: admin_smilies.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_smilies.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** admin_smilies.php	2001/11/19 23:39:24	1.15
--- admin_smilies.php	2001/11/20 14:48:42	1.16
***************
*** 73,81 ****
  	if( !@is_dir($phpbb_root_path . $board_config['smilies_path'] . '/' . $file) )
  	{
! 		if( !is_null(@getimagesize($phpbb_root_path . $board_config['smilies_path'] . '/' . $file)) )
  		{
  			$smiley_images[] = $file;
  		}
! 		elseif(eregi('.pak$', $file) )
  		{	
  			$smiley_paks[] = $file;
--- 73,83 ----
  	if( !@is_dir($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;
  		}
! 		else if( eregi('.pak$', $file) )
  		{	
  			$smiley_paks[] = $file;