summaryrefslogtreecommitdiff
path: root/inc/parserutils.php
diff options
context:
space:
mode:
authorandi <andi@splitbrain.org>2005-04-25 20:35:43 +0200
committerandi <andi@splitbrain.org>2005-04-25 20:35:43 +0200
commita2d649c465f8f77c2b1dfdcc3724e69fde78a296 (patch)
treef2316d418d3e15a5b6dc05b12c36366eb6f86b09 /inc/parserutils.php
parentfad00a2e39785242e6fc4163290e751b079d1a0d (diff)
downloadrpg-a2d649c465f8f77c2b1dfdcc3724e69fde78a296.tar.gz
rpg-a2d649c465f8f77c2b1dfdcc3724e69fde78a296.tar.bz2
changed XHTML renderer from outputbuffering to string appending #272
darcs-hash:20050425183543-9977f-86c2d99ebfcb30849443b7bc5ef1a09859148732.gz
Diffstat (limited to 'inc/parserutils.php')
-rw-r--r--inc/parserutils.php11
1 files changed, 5 insertions, 6 deletions
diff --git a/inc/parserutils.php b/inc/parserutils.php
index a2d750099..717fa64e7 100644
--- a/inc/parserutils.php
+++ b/inc/parserutils.php
@@ -25,8 +25,8 @@ function p_wiki_xhtml($id, $rev='', $excuse=true){
$ret = '';
//ensure $id is in global $ID (needed for parsing)
- global $ID;
- $ID = $id;
+// global $ID;
+// $ID = $id;
if($rev){
if(@file_exists($file)){
@@ -75,7 +75,6 @@ function p_cached_xhtml($file){
&& $cachetime > @filemtime($file) // cache is fresh
&& ((time() - $cachetime) < $conf['cachetime']) // and is cachefile young enough
&& !isset($_REQUEST['purge']) // no purge param was set
-
&& ($cachetime > @filemtime(DOKU_INC.'conf/dokuwiki.php')) // newer than the config file
&& ($cachetime > @filemtime(DOKU_INC.'conf/local.php')) // newer than the local config file
&& ($cachetime > @filemtime(DOKU_INC.'inc/parser/xhtml.php')) // newer than the renderer
@@ -213,9 +212,9 @@ function p_get_instructions($text){
$Parser->addMode('eol',new Doku_Parser_Mode_Eol());
// Do the parsing
- $parsed = $Parser->parse($text);
-# dbg($parsed);
- return $parsed;
+ $p = $Parser->parse($text);
+# dbg($p);
+ return $p;
}
/**