[mxbb-commits] core/includes mx_functions_tools.php,1.53,1.54

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

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

Modified Files:
	mx_functions_tools.php 
Log Message:
fix

Index: mx_functions_tools.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** mx_functions_tools.php	11 Jul 2009 03:22:06 -0000	1.53
--- mx_functions_tools.php	12 Jul 2009 05:13:00 -0000	1.54
***************
*** 165,174 ****
  		if ($text != '' && $bbcode_uid != '')
  		{
! 			//$text = ($this->bbcode_on) ? $mx_bbcode->bbencode_second_pass($text, $bbcode_uid) : preg_replace("/\:$bbcode_uid/si", '', $text);
! 			$text = ($this->bbcode_on) ? $mx_bbcode->decode($text, $bbcode_uid): preg_replace("/\:$bbcode_uid/si", '', $text);
  		}
  		
! 		/*
! 		if ( $text != '' )
  		{
  			$text = $mx_bbcode->make_clickable($text);
--- 165,174 ----
  		if ($text != '' && $bbcode_uid != '')
  		{
! 			$text = ($this->bbcode_on) ? $mx_bbcode->bbencode_second_pass($text, $bbcode_uid) : preg_replace("/\:$bbcode_uid/si", '', $text);
! 			//$text = ($this->bbcode_on) ? $mx_bbcode->decode($text, $bbcode_uid): preg_replace("/\:$bbcode_uid/si", '', $text);
  		}
  		
! 
! 		if ($text != '')
  		{
  			$text = $mx_bbcode->make_clickable($text);
***************
*** 178,189 ****
  		// Parse smilies
  		//
! 		if ( $this->smilies_on )
  		{
! 			if ( $text != '' )
  			{
  				$text = $mx_bbcode->smilies_pass($text);
  			}
  		}
- 		*/
  		
  		//
--- 178,188 ----
  		// Parse smilies
  		//
! 		if ($this->smilies_on)
  		{
! 			if ($text != '')
  			{
  				$text = $mx_bbcode->smilies_pass($text);
  			}
  		}
  		
  		//