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

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

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

Modified Files:
	functions_posting.php 
Log Message:
downgrd

Index: functions_posting.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_posting.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** functions_posting.php	28 Jul 2009 18:42:25 -0000	1.10
--- functions_posting.php	28 Jul 2009 20:27:57 -0000	1.11
***************
*** 17,20 ****
--- 17,21 ----
  }
  
+ 
  /**
  * Fill smiley templates (or just the variables) with smilies, either in a window or inline
***************
*** 22,26 ****
  function generate_smilies($mode, $forum_id)
  {
[...1663 lines suppressed...]
  		$params .= '&t=' . $data['topic_id'];
--- 2410,2414 ----
  	$params = $add_anchor = '';
  
! 	if ($phpbb_auth->acl_get('f_noapprove', $data['forum_id']) || $phpbb_auth->acl_get('m_approve', $data['forum_id']))
  	{
  		$params .= '&t=' . $data['topic_id'];
***************
*** 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;
--- 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;