[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.94,1.95

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

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv24809/includes

Modified Files:
	functions.php 
Log Message:
Oops, another file I forgot to commit, perhaps I should commit myself ...

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -r1.94 -r1.95
*** functions.php	2001/12/16 01:27:16	1.94
--- functions.php	2001/12/17 00:46:54	1.95
***************
*** 834,846 ****
  	static $smilies;
  
! 	if(empty($smilies))
  	{
  		$sql = "SELECT code, smile_url
  			FROM " . SMILIES_TABLE;
! 		if($result = $db->sql_query($sql))
  		{
! 			$smilies = $db->sql_fetchrowset($result);
  		}
  	}
  	usort($smilies, 'smiley_sort');
  	for($i = 0; $i < count($smilies); $i++)
--- 834,854 ----
  	static $smilies;
  
! 	if( empty($smilies) )
  	{
  		$sql = "SELECT code, smile_url
  			FROM " . SMILIES_TABLE;
! 		if( !$result = $db->sql_query($sql) )
  		{
! 			message_die(GENERAL_ERROR, "Couldn't obtain smilies data", "", __LINE__, __FILE__, $sql);
  		}
+ 
+ 		if( !$db->sql_numrows($result) )
+ 		{
+ 			return $message;
+ 		}
+ 
+ 		$smilies = $db->sql_fetchrowset($result);
  	}
+ 
  	usort($smilies, 'smiley_sort');
  	for($i = 0; $i < count($smilies); $i++)
***************
*** 850,867 ****
  	}
  
! 	if($i > 0)
  	{
  		$message = preg_replace($orig, $repl, ' ' . $message . ' ');
  		$message = substr($message, 1, -1);
  	}
! 	return($message);
  }
  function smiley_sort($a, $b)
  {
! 	if (strlen($a['code']) == strlen($b['code']))
  	{
  		return 0;
  	}
! 	return (strlen($a['code']) > strlen($b['code'])) ? -1 : 1;
  }
  
--- 858,877 ----
  	}
  
! 	if( $i > 0 )
  	{
  		$message = preg_replace($orig, $repl, ' ' . $message . ' ');
  		$message = substr($message, 1, -1);
  	}
! 
! 	return $message;
  }
  function smiley_sort($a, $b)
  {
! 	if ( strlen($a['code']) == strlen($b['code']) )
  	{
  		return 0;
  	}
! 
! 	return ( strlen($a['code']) > strlen($b['code']) ) ? -1 : 1;
  }