Add CentralAuth cookies to the XVO header

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index b92c012..5cd275f 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1501,6 +1501,9 @@ $wgCookiePath = '/';
 $wgCookieSecure = ($wgProto == 'https');
 $wgDisableCookieCheck = false;
 
+/** A list of cookies that vary the cache (for use by extensions) */
+$wgCacheVaryCookies = array();
+
 /** Override to customise the session name */
 $wgSessionName = false;
 

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 70f6f12..4440dbc 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -544,11 +544,20 @@ class OutputPage {
        }
 
        function getCacheVaryCookies() {
-               global $wgCookiePrefix;
-               return array( 
-                       "{$wgCookiePrefix}Token",
-                       "{$wgCookiePrefix}LoggedOut",
-                       session_name() );
+               global $wgCookiePrefix, $wgCacheVaryCookies;
+               static $cookies;
+               if ( $cookies === null ) {
+                       $cookies = array_merge( 
+                               array(
+                                       "{$wgCookiePrefix}Token",
+                                       "{$wgCookiePrefix}LoggedOut",
+                                       session_name()
+                               ),
+                               $wgCacheVaryCookies
+                       );
+                       wfRunHooks('GetCacheVaryCookies', array( $this, &$cookies ) );
+               }
+               return $cookies;
        }
 
        function uncacheableBecauseRequestVars() {