[mxbb-commits] core/modules/mx_textblocks mx_textblock_multi.php, 1.16, 1.17

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_textblocks
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12094/modules/mx_textblocks

Modified Files:
	mx_textblock_multi.php 
Log Message:
A few fixes related to new mx_text class, and other minor fixes

Index: mx_textblock_multi.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_multi.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** mx_textblock_multi.php	25 Jun 2006 21:52:42 -0000	1.16
--- mx_textblock_multi.php	26 Jun 2006 21:32:23 -0000	1.17
***************
*** 108,112 ****
  
  	$i = 0;
- 
  	while( $i < count($art_pages) )
  	{
--- 108,111 ----
***************
*** 114,156 ****
  
  		$art_split = explode('[toc]', $art_pages[$i]);
! 		$article_toc = $art_split[0];
! 
! 		//
! 		// Fix up the toc title
! 		//
! 
! 		if( !$allow_html )
! 		{
! 			$article_toc = preg_replace('#(<)([\/]?.*?)(>)#is', "&lt;\\2&gt;", $article_toc);
! 		}
! 
! 		//
! 		// Parse message
! 		//
! 		$article_toc = preg_replace("/\[(\S+)\]/e", "", $article_toc);
! 		$article_toc = make_clickable($article_toc);
! 
! 		//
! 		// Parse smilies
! 		//
! 		if( $allow_smilies )
! 		{
! 			$article_toc = mx_smilies_pass($article_toc);
! 		}
! 
! 		//
! 		// Replace naughty words
! 		//
! 		if( count($orig_word) )
! 		{
! 			$article_toc = str_replace('\"', '"', substr(preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace(\$orig_word, \$replacement_word, '\\0')", '>' . $article_toc . '<'), 1, -1));
! 		}
  
! 		//
! 		// Replace newlines (we use this rather than nl2br because
! 		// till recently it wasn't XHTML compliant)
! 		// $article_toc = str_replace("\n", "\n<br />\n", $article_toc);
! 		//
! 		$page_toc = $art_pages[$i];
  
  		if( $page_num != $i )
--- 113,121 ----
  
  		$art_split = explode('[toc]', $art_pages[$i]);
! 		$article_toc = trim($art_split[0]);
  
! 		//$article_toc = preg_replace( "'\[[\/\!]*?[^\[\]]*?\]'si", "", $article_toc ); // Fixed
! 		$article_toc = $mx_text->display($article_toc, $mx_block->get_parameters( 'Text', MX_GET_PAR_OPTIONS ));
! 		$article_toc = strip_tags($article_toc);
  
  		if( $page_num != $i )