From 27c0fbe848e636f253ac84e582aaa48c6e7634d2 Mon Sep 17 00:00:00 2001
From: "Paul S. Owen" <psotfx@users.sourceforge.net>
Date: Sat, 29 Dec 2001 15:18:34 +0000
Subject: [PATCH] Fixed bug #496954

git-svn-id: file:///svn/phpbb/trunk@1737 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/post.php | 21 +++++++++++----------
 phpBB/posting.php       |  4 ++--
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/phpBB/includes/post.php b/phpBB/includes/post.php
index 391671d716..0e78e427a3 100644
--- a/phpBB/includes/post.php
+++ b/phpBB/includes/post.php
@@ -101,15 +101,15 @@ function prepare_message($message, $html_on, $bbcode_on, $smile_on, $bbcode_uid
 // Fill smiley templates (or just the variables) with smileys
 // Either in a window or inline
 //
-function generate_smilies($mode)
+function generate_smilies($mode, $page_id)
 {
 	global $db, $board_config, $template, $lang, $images, $theme, $phpEx;
-	global $user_ip, $forum_id, $session_length;
+	global $user_ip, $session_length;
 	global $userdata;
 
-	if( $mode == 'window' )
+	if( $mode == "window" )
 	{
-		$userdata = session_pagestart($user_ip, $forum_id, $session_length);
+		$userdata = session_pagestart($user_ip, $page_id, $session_length);
 		init_userprefs($userdata);
 
 		$gen_simple_header = TRUE;
@@ -141,8 +141,8 @@ function generate_smilies($mode)
 
 			$num_smilies = count($rowset);
 
-			$smilies_count = ( $mode == 'inline' ) ? min(19, $num_smilies) : $num_smilies;
-			$smilies_split_row = ( $mode == 'inline' ) ? 3 : 7;
+			$smilies_count = ( $mode == "inline" ) ? min(19, $num_smilies) : $num_smilies;
+			$smilies_split_row = ( $mode == "inline" ) ? 3 : 7;
 
 			$s_colspan = 0;
 			$row = 0;
@@ -165,7 +165,7 @@ function generate_smilies($mode)
 
 				if( $col == $smilies_split_row )
 				{
-					if( $mode == 'inline' && $row == 4 )
+					if( $mode == "inline" && $row == 4 )
 					{
 						break;
 					}
@@ -178,7 +178,7 @@ function generate_smilies($mode)
 				}
 			}
 
-			if( $mode == 'inline' && $num_smilies > 20)
+			if( $mode == "inline" && $num_smilies > 20)
 			{
 				$template->assign_block_vars("switch_smilies_extra", array());
 
@@ -196,11 +196,12 @@ function generate_smilies($mode)
 		}
 	}
 
-	if( $mode == 'window' )
+	if( $mode == "window" )
 	{
 		$template->pparse("smiliesbody");
 
 		include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
 	}
 }
-?>
+
+?>
\ No newline at end of file
diff --git a/phpBB/posting.php b/phpBB/posting.php
index aaa04fdefb..e09e1ab73d 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -677,7 +677,7 @@ if( $mode == "topicreview" )
 }
 else if( $mode == "smilies" )
 {
-	generate_smilies('window');
+	generate_smilies("window", PAGE_POSTING);
 	exit;
 }
 
@@ -2584,7 +2584,7 @@ if( $error )
 //
 // Send smilies to template
 //
-generate_smilies('inline');
+generate_smilies("inline", PAGE_POSTING);
 
 //
 // User not logged in so offer up a username