Merge "Implement mediawiki.cookie module"

diff --cc RELEASE-NOTES-1.23
Simple merge

diff --cc includes/resourceloader/ResourceLoaderStartUpModule.php
index f9c5057,d4359c5..63a444b
--- 1/includes/resourceloader/ResourceLoaderStartUpModule.php
--- 2/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;
  

diff --cc maintenance/jsduck/categories.json
Simple merge

diff --cc resources/Resources.php
Simple merge

diff --cc tests/qunit/QUnitTestResources.php
Simple merge