From ef927d3904ac4fc8222ac4c43527b4078ec7e653 Mon Sep 17 00:00:00 2001 From: Krinkle Date: Fri, 9 Sep 2011 01:03:27 +0000 Subject: [PATCH] Remove wgProto from mw.config * Introduced in r82575 spontaneously, but was never used. * It was removed from PHP by Tim in r90193, who gracefully kept a work-around in place to still have a protocol available in mw.config. * Since it was new in JS in 1.18 (which hasn't been released yet), I suggest we take it out right away, especially because the PHP counterpart has been deprecated as well. No release notes needed. --- includes/resourceloader/ResourceLoaderStartUpModule.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php index 436a569d44..40786fa732 100644 --- a/includes/resourceloader/ResourceLoaderStartUpModule.php +++ b/includes/resourceloader/ResourceLoaderStartUpModule.php @@ -69,10 +69,6 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule { } } - - $serverBits = wfParseUrl( $wgServer ); - $protocol = $serverBits ? $serverBits['scheme'] : 'http'; - // Build list of variables $vars = array( 'wgLoadScript' => $wgLoadScript, @@ -108,7 +104,6 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule { 'wgFileCanRotate' => BitmapHandler::canRotate(), 'wgAvailableSkins' => Skin::getSkinNames(), 'wgExtensionAssetsPath' => $wgExtensionAssetsPath, - 'wgProto' => $protocol, // MediaWiki sets cookies to have this prefix by default 'wgCookiePrefix' => $wgCookiePrefix, 'wgResourceLoaderMaxQueryLength' => $wgResourceLoaderMaxQueryLength, -- 2.20.1