[Tikiwiki-cvs] tiki/lib tikilib.php,1.577,1.578

[<pap...@us...>]

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

Modified Files:
	tikilib.php 
Log Message:
Fixed notice and possible ...page.. problems with tikilib parser


Index: tikilib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v
retrieving revision 1.577
retrieving revision 1.578
diff -u -d -r1.577 -r1.578
--- tikilib.php	18 May 2005 23:43:14 -0000	1.577
+++ tikilib.php	19 May 2005 18:34:46 -0000	1.578
@@ -19,8 +19,12 @@
 // * shared functions (marked as /*shared*/) are functions that are
 //   called from Tiki modules.
 
+/*if (isset($_REQUEST['tikiParser']) && $GLOBALS['pear_wiki_parser']) {
+    $GLOBALS['pear_wiki_parser'] = false;
+}*/
+
 if (!defined('PAGE_SEP')) {
-    define('PAGE_SEP', isset($GLOBALS['pear_wiki_parser']) ? '...page...' : 'PAGE MARKER HERE*&^%$#^$%*PAGEMARKERHERE');
+    define('PAGE_SEP', isset($GLOBALS['pear_wiki_parser']) && $GLOBALS['pear_wiki_parser'] == 'y' ? '...page...' : 'PAGE MARKER HERE*&^%$#^$%*PAGEMARKERHERE');
 }
 
 class TikiLib extends TikiDB {
@@ -4232,7 +4236,7 @@
 
     //PARSEDATA
     function parse_data($data,$is_html=false) {
-        if ($GLOBALS['pear_wiki_parser'] == 'y') {
+        if (isset($GLOBALS['pear_wiki_parser']) && $GLOBALS['pear_wiki_parser'] == 'y') {
             require_once('lib/wiki/Text/Wiki/Tiki.php');
             $wiki =& new Text_Wiki_Tiki();
             $wiki->setRenderConf('xhtml', 'wikilink', 'exists_callback', array(&$this, 'page_exists'));