[Phpbb-checkins] CVS: phpBB2/includes post.php,1.11,1.12

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

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

Modified Files:
	post.php 
Log Message:
Fixed bug #496954

Index: post.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/post.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** post.php	2001/12/18 20:35:17	1.11
--- post.php	2001/12/29 15:18:28	1.12
***************
*** 102,114 ****
  // Either in a window or inline
  //
! function generate_smilies($mode)
  {
  	global $db, $board_config, $template, $lang, $images, $theme, $phpEx;
! 	global $user_ip, $forum_id, $session_length;
  	global $userdata;
  
! 	if( $mode == 'window' )
  	{
! 		$userdata = session_pagestart($user_ip, $forum_id, $session_length);
  		init_userprefs($userdata);
  
--- 102,114 ----
  // Either in a window or inline
  //
! function generate_smilies($mode, $page_id)
  {
  	global $db, $board_config, $template, $lang, $images, $theme, $phpEx;
! 	global $user_ip, $session_length;
  	global $userdata;
  
! 	if( $mode == "window" )
  	{
! 		$userdata = session_pagestart($user_ip, $page_id, $session_length);
  		init_userprefs($userdata);
  
***************
*** 142,147 ****
  			$num_smilies = count($rowset);
  
! 			$smilies_count = ( $mode == 'inline' ) ? min(19, $num_smilies) : $num_smilies;
! 			$smilies_split_row = ( $mode == 'inline' ) ? 3 : 7;
  
  			$s_colspan = 0;
--- 142,147 ----
  			$num_smilies = count($rowset);
  
! 			$smilies_count = ( $mode == "inline" ) ? min(19, $num_smilies) : $num_smilies;
! 			$smilies_split_row = ( $mode == "inline" ) ? 3 : 7;
  
  			$s_colspan = 0;
***************
*** 166,170 ****
  				if( $col == $smilies_split_row )
  				{
! 					if( $mode == 'inline' && $row == 4 )
  					{
  						break;
--- 166,170 ----
  				if( $col == $smilies_split_row )
  				{
! 					if( $mode == "inline" && $row == 4 )
  					{
  						break;
***************
*** 179,183 ****
  			}
  
! 			if( $mode == 'inline' && $num_smilies > 20)
  			{
  				$template->assign_block_vars("switch_smilies_extra", array());
--- 179,183 ----
  			}
  
! 			if( $mode == "inline" && $num_smilies > 20)
  			{
  				$template->assign_block_vars("switch_smilies_extra", array());
***************
*** 197,201 ****
  	}
  
! 	if( $mode == 'window' )
  	{
  		$template->pparse("smiliesbody");
--- 197,201 ----
  	}
  
! 	if( $mode == "window" )
  	{
  		$template->pparse("smiliesbody");
***************
*** 204,206 ****
  	}
  }
! ?>
--- 204,207 ----
  	}
  }
! 
! ?>
\ No newline at end of file