[mxbb-commits] core/includes/sessions/phpbb3 bbcode.php, 1.12, 1.13 core.php, 1.22, 1.23

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/sessions/phpbb3
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11573/includes/sessions/phpbb3

Modified Files:
	bbcode.php core.php 
Log Message:
phpBB3 bbcode update

Index: core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/core.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** core.php	18 Apr 2013 00:43:02 -0000	1.22
--- core.php	26 Apr 2013 14:14:18 -0000	1.23
***************
*** 1540,1543 ****
  include_once($mx_root_path . 'includes/sessions/phpbb3/bbcode.' . $phpEx); // BBCode associated functions
  
- 
  ?>
\ No newline at end of file
--- 1540,1542 ----

Index: bbcode.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/bbcode.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** bbcode.php	16 Dec 2011 01:35:07 -0000	1.12
--- bbcode.php	26 Apr 2013 14:14:17 -0000	1.13
***************
*** 1679,1682 ****
--- 1679,1689 ----
  		global $mx_root_path, $phpbb_root_path, $phpEx, $mx_page;
  		
+ 		if (!$mytext)
+ 		{
+ 			return '';
+ 		}
+ 
+ 		$mytext = mx_censor_text($mytext);		
+ 		
  		//Do some checks
  		$phpbb3_text = $bbcode_bitfield ? true : false;
***************
*** 1688,1691 ****
--- 1695,1702 ----
  		}
  		
+ 		$mytext = str_replace(array("\n", "\r"), array('<br />', "\n"), $mytext);		
+ 		$mytext = bbcode_nl2br($mytext);
+ 		
+ 		//$mytext = smiley_text($mytext, !($flags & OPTION_FLAG_SMILIES));		
  		if ($smilies_on && $phpbb3_text)
  		{