From: Robmoen <rmoen@wikimedia.org>
Date: Wed, 14 May 2014 18:17:55 +0000 (+0000)
Subject: Merge "Implement mediawiki.cookie module"
X-Git-Tag: 1.31.0-rc.0~15718
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=476997b3bbfb88bbae0083cd1f882f4b97f357b7;p=lhc%2Fweb%2Fwiklou.git

Merge "Implement mediawiki.cookie module"
---

476997b3bbfb88bbae0083cd1f882f4b97f357b7
diff --cc includes/resourceloader/ResourceLoaderStartUpModule.php
index f9c5057709,d4359c5707..63a444b518
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@@ -44,11 -44,12 +44,12 @@@ class ResourceLoaderStartUpModule exten
  		}
  
  		global $wgLoadScript, $wgScript, $wgStylePath, $wgScriptExtension,
 -			$wgArticlePath, $wgScriptPath, $wgServer, $wgContLang,
 -			$wgVariantArticlePath, $wgActionPaths, $wgVersion,
 +			$wgArticlePath, $wgScriptPath, $wgServer, $wgServerName,
 +			$wgContLang, $wgVariantArticlePath, $wgActionPaths, $wgVersion,
  			$wgEnableAPI, $wgEnableWriteAPI, $wgDBname,
  			$wgSitename, $wgFileExtensions, $wgExtensionAssetsPath,
- 			$wgCookiePrefix, $wgResourceLoaderMaxQueryLength,
+ 			$wgCookiePrefix, $wgCookieDomain, $wgCookiePath,
+ 			$wgCookieExpiration, $wgResourceLoaderMaxQueryLength,
  			$wgResourceLoaderStorageEnabled, $wgResourceLoaderStorageVersion,
  			$wgSearchType;