[mxbb-commits] core/includes/shared/phpbb3/includes functions_posting.php, 1.9, 1.10

[FlorinCB <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv1162/shared/phpbb3/includes

Modified Files:
	functions_posting.php 
Log Message:
update

Index: functions_posting.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_posting.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** functions_posting.php	31 Oct 2008 18:55:14 -0000	1.9
--- functions_posting.php	28 Jul 2009 18:42:25 -0000	1.10
***************
*** 17,21 ****
  }
  
- 
  /**
  * Fill smiley templates (or just the variables) with smilies, either in a window or inline
--- 17,20 ----
***************
*** 23,27 ****
  function generate_smilies($mode, $forum_id)
  {
[...1663 lines suppressed...]
  		$params .= '&t=' . $data['topic_id'];
--- 2515,2519 ----
  	$params = $add_anchor = '';
  
! 	if ($post_approval)
  	{
  		$params .= '&t=' . $data['topic_id'];
***************
*** 2426,2430 ****
  
  	$url = (!$params) ? "{$phpbb_root_path}viewforum.$phpEx" : "{$phpbb_root_path}viewtopic.$phpEx";
! 	$url = mx3_append_sid($url, 'f=' . $data['forum_id'] . $params) . $add_anchor;
  
  	return $url;
--- 2531,2535 ----
  
  	$url = (!$params) ? "{$phpbb_root_path}viewforum.$phpEx" : "{$phpbb_root_path}viewtopic.$phpEx";
! 	$url = append_sid($url, 'f=' . $data['forum_id'] . $params) . $add_anchor;
  
  	return $url;