diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-12-29 15:18:34 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-12-29 15:18:34 +0000 |
| commit | 27c0fbe848e636f253ac84e582aaa48c6e7634d2 (patch) | |
| tree | a95856c6e17aea2f1d2143cf4754773e269fdf2b /phpBB/includes | |
| parent | a4b2f460ee977bd938f1fc889cb5a64e07e08480 (diff) | |
| download | forums-27c0fbe848e636f253ac84e582aaa48c6e7634d2.tar forums-27c0fbe848e636f253ac84e582aaa48c6e7634d2.tar.gz forums-27c0fbe848e636f253ac84e582aaa48c6e7634d2.tar.bz2 forums-27c0fbe848e636f253ac84e582aaa48c6e7634d2.tar.xz forums-27c0fbe848e636f253ac84e582aaa48c6e7634d2.zip | |
Fixed bug #496954
git-svn-id: file:///svn/phpbb/trunk@1737 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/post.php | 21 |
1 files changed, 11 insertions, 10 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 |