aboutsummaryrefslogtreecommitdiff
path: root/pmwiki.php
diff options
context:
space:
mode:
Diffstat (limited to 'pmwiki.php')
-rw-r--r--pmwiki.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/pmwiki.php b/pmwiki.php
index afd69474..82706058 100644
--- a/pmwiki.php
+++ b/pmwiki.php
@@ -177,6 +177,7 @@ $PageTextVarPatterns = array(
$WikiTitle = 'PmWiki';
$Charset = 'ISO-8859-1';
+$HTMLHeaderFmt['Content-type'] = '';
$HTTPHeaders = array(
"Expires: Tue, 01 Jan 2002 00:00:00 GMT",
"Cache-Control: no-store, no-cache, must-revalidate",
@@ -1910,14 +1911,14 @@ function ProcessPrintFmt($pagename,$x) {
function PostPrintFmt($pagename,$fmt) {
global $EnablePrePrintFmt, $KeepToken, $HTTPHeaders, $FmtV;
if (is_array($fmt)) {
- foreach($fmt as $f) PostPrintFmt($pagename,$f);
+ foreach($fmt as $f) PostPrintFmt($pagename,$f);
return;
}
if ($fmt == 'headers:') {
foreach($HTTPHeaders as $h) (@$sent++) ? @header($h) : header($h);
return;
}
- $fmt = strval($fmt);
+ if (!is_string($fmt)) $fmt = strval($fmt);
$preprint = IsEnabled($EnablePrePrintFmt, 1);
if ($preprint && substr($fmt, 0, 4) == "$KeepToken$KeepToken") {