summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2007-10-16 20:56:26 +0200
committerAndreas Gohr <andi@splitbrain.org>2007-10-16 20:56:26 +0200
commit857670311b4c77ce1367d1c221c3c7ae604fbacc (patch)
treebde2cca5d00cf2df5dbf6151d8bc35cea12fc698
parent014d0ab65509e597b262c7fbfea633e1d0a5dc23 (diff)
downloadrpg-857670311b4c77ce1367d1c221c3c7ae604fbacc.tar.gz
rpg-857670311b4c77ce1367d1c221c3c7ae604fbacc.tar.bz2
header support for renderer plugins
Renderer plugins now can store HTTP header information in 'format <mode>' which will be used to send their output. Also fixes a problem with loading cache files. darcs-hash:20071016185626-7ad00-c0e18a90b310daf0d3a3c01d7a73f3524ced803d.gz
-rw-r--r--inc/actions.php4
-rw-r--r--inc/parserutils.php2
2 files changed, 5 insertions, 1 deletions
diff --git a/inc/actions.php b/inc/actions.php
index 653910fe0..9e5ec5041 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -408,7 +408,11 @@ function act_export($act){
// try to run renderer
$mode = substr($act,7);
$text = p_cached_output(wikiFN($ID,$REV), $mode);
+ $headers = p_get_metadata($ID,"format $mode");
if(!is_null($text)){
+ if(is_array($headers)) foreach($headers as $key => $val){
+ header("$key: $val");
+ }
print $text;
exit;
}
diff --git a/inc/parserutils.php b/inc/parserutils.php
index 66cf71b2b..d24417898 100644
--- a/inc/parserutils.php
+++ b/inc/parserutils.php
@@ -147,7 +147,7 @@ function p_cached_output($file, $format='xhtml', $id='') {
$cache = new cache_renderer($id, $file, $format);
if ($cache->useCache()) {
- $parsed = $cache->retrieveCache();
+ $parsed = $cache->retrieveCache(false);
if($conf['allowdebug'] && $format=='xhtml') $parsed .= "\n<!-- cachefile {$cache->cache} used -->\n";
} else {
$parsed = p_render($format, p_cached_instructions($file,false,$id), $info);