[Tikiwiki-cvs] tiki/lib tikilib.php,1.653,1.654

[<rlp...@us...>]

Update of /cvsroot/tikiwiki/tiki/lib
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8483/lib

Modified Files:
	tikilib.php 
Log Message:
Deal with ~tc~ and ~hc~ better.  Also, don't run on zero-length pages.


Index: tikilib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v
retrieving revision 1.653
retrieving revision 1.654
diff -u -d -r1.653 -r1.654
--- tikilib.php	23 Sep 2006 13:05:58 -0000	1.653
+++ tikilib.php	2 Oct 2006 05:24:11 -0000	1.654
@@ -4500,7 +4500,13 @@
 
     //PARSEDATA
     function parse_data($data,$is_html=false) {
-        if (isset($GLOBALS['pear_wiki_parser']) && $GLOBALS['pear_wiki_parser'] == 'y') {
+    	// Don't bother if there's nothing...
+	if( mb_strlen( $data ) < 1 )
+	{
+	    return;
+	}
+
+	if (isset($GLOBALS['pear_wiki_parser']) && $GLOBALS['pear_wiki_parser'] == 'y') {
             require_once('Text/Wiki/Tiki.php');
             $wiki =& new Text_Wiki_Tiki();
             $wiki->setRenderConf('xhtml', 'wikilink', 'exists_callback', array(&$this, 'page_exists'));
@@ -4672,8 +4678,8 @@
 	$data = preg_replace(';~pre~(.*?)~/pre~;s', '<pre>$1</pre>', $data);
 
 	// Handle comment sections
-	$data = preg_replace(';\s*~tc~(.*?)~/tc~\s*;s', '', $data);
-	$data = preg_replace(';\n*~hc~(.*?)~/hc~\n*;s', '<!-- $1 -->', $data);
+	$data = preg_replace(';~tc~(.*?)~/tc~;s', '', $data);
+	$data = preg_replace(';~hc~(.*?)~/hc~;s', '<!-- $1 -->', $data);
 
 	// Extract [link] sections (to be re-inserted later)
 	$noparsedlinks = array();