aboutsummaryrefslogtreecommitdiff
path: root/pmwiki.php
diff options
context:
space:
mode:
authorpetko <petko@524c5546-5005-0410-9a3e-e25e191bd360>2023-01-21 08:00:21 +0000
committerpetko <petko@524c5546-5005-0410-9a3e-e25e191bd360>2023-01-21 08:00:21 +0000
commit1f496e8450222a39227eae65c1217ee71e4911c2 (patch)
tree4c179ed27b6074632a464f859c6d478ca8f2573f /pmwiki.php
parent0ba013ffc28ded2553d258fcba3b98e7c038d7b7 (diff)
downloadpmwiki.svn-1f496e8450222a39227eae65c1217ee71e4911c2.tar.bz2
Only set cookie params if headers not sent. PageVar() update for PHP 8.
git-svn-id: svn://pmwiki.org/pmwiki/trunk@4343 524c5546-5005-0410-9a3e-e25e191bd360
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 efccda08..145c4941 100644
--- a/pmwiki.php
+++ b/pmwiki.php
@@ -445,7 +445,8 @@ function pm_session_start($a = array()) {
);
}
else {
- session_set_cookie_params($a);
+ if (!headers_sent())
+ session_set_cookie_params($a);
}
return @session_start();
}
@@ -1272,7 +1273,7 @@ function PageVar($pagename, $var, $pn = '') {
if (@$page['=auth']['read']) $authpage = &$page;
}
} else { $group = ''; $name = ''; }
- if (@$FmtPV[$var]) return eval("return ({$FmtPV[$var]});");
+ if (isset($FmtPV[$var])) return eval("return ({$FmtPV[$var]});");
if (strncmp($var, '$:', 2)==0) return PageTextVar($pn, substr($var, 2));
return '';
}