summaryrefslogtreecommitdiff
path: root/includes/actions
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2013-11-14 23:19:13 +0100
committerPierre Schmitz <pierre@archlinux.de>2013-11-14 23:19:13 +0100
commitaf4da56f1ad4d3ef7b06557bae365da2ea27a897 (patch)
treec018c4033c36be77f9ec699cfd485be82c7542d7 /includes/actions
parent91e194556c52d2f354344f930419eef2dd6267f0 (diff)
Update to MediaWiki 1.21.3
Diffstat (limited to 'includes/actions')
-rw-r--r--includes/actions/RawAction.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/includes/actions/RawAction.php b/includes/actions/RawAction.php
index d1d457c0..12ce9f98 100644
--- a/includes/actions/RawAction.php
+++ b/includes/actions/RawAction.php
@@ -94,6 +94,9 @@ class RawAction extends FormlessAction {
# Output may contain user-specific data;
# vary generated content for open sessions on private wikis
$privateCache = !User::groupHasPermission( '*', 'read' ) && ( $smaxage == 0 || session_id() != '' );
+ // Bug 53032 - make this private if user is logged in,
+ // so we don't accidentally cache cookies
+ $privateCache = $privateCache ?: $this->getUser()->isLoggedIn();
# allow the client to cache this for 24 hours
$mode = $privateCache ? 'private' : 'public';
$response->header( 'Cache-Control: ' . $mode . ', s-maxage=' . $smaxage . ', max-age=' . $maxage );