From: <pap...@us...> - 2005-06-27 16:50:56
|
Update of /cvsroot/tikiwiki/tiki/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18427 Modified Files: tikilib.php Log Message: remove setup of PAGE_SEP here, the config isn't loaded so *this won't work* More to using global for PAGE_SEP Index: tikilib.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v retrieving revision 1.586 retrieving revision 1.587 diff -u -d -r1.586 -r1.587 --- tikilib.php 27 Jun 2005 16:45:35 -0000 1.586 +++ tikilib.php 27 Jun 2005 16:50:44 -0000 1.587 @@ -6,10 +6,6 @@ exit; } -if (!defined('PAGE_SEP')) { - define('PAGE_SEP', isset($GLOBALS['pear_wiki_parser']) && $GLOBALS['pear_wiki_parser'] == 'y' ? 'PAGE MARKER HERE*&^%$#^$%*PAGEMARKERHERE' : '...page...'); -} - require_once ('lib/pear/Date.php'); require_once ('lib/tikidate.php'); require_once ('lib/tikidblib.php'); @@ -5297,11 +5293,11 @@ $aclose = '</a>' . $aclose; } $line = $anchor . "<h$hdrlevel>" . substr($line, $hdrlevel + $addremove). "</h$hdrlevel>" . $aclose; - } elseif (!strcmp($line, PAGE_SEP)) { + } elseif (!strcmp($line, $GLOBALS['PAGE_SEP'])) { // Close open paragraph, lists, and div's $this->close_blocks($data, $in_paragraph, $listbeg, $divdepth, 1, 1, 1); // Leave line unchanged... tiki-index.php will split wiki here - $line = PAGE_SEP; + $line = $GLOBALS['PAGE_SEP']; $pageNum += 1; } else { /** Usual paragraph. |