jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/393665 )
Change subject: Remove $wgStyleVersion ...................................................................... Remove $wgStyleVersion Remove some unused variables Bug: T181318 Change-Id: I8ba1eebc9f6a57d2f0e572ebbc4c8789e92159fd --- M SpecialApiExplorer.php 1 file changed, 6 insertions(+), 11 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/SpecialApiExplorer.php b/SpecialApiExplorer.php index 1e82641..ce71f8a 100644 --- a/SpecialApiExplorer.php +++ b/SpecialApiExplorer.php @@ -45,20 +45,15 @@ * @param $par - parameters for SpecialPage. Ignored. */ public function execute( $par = null ) { - global $wgOut, $wgExtensionsPath, $wgCityId, $wgStyleVersion; + global $wgOut, $wgExtensionsPath; wfProfileIn( __METHOD__ ); - // TODO: Make this work for ResourceLoader (Wikia isn't using RL yet at the time of this writing). - // Wikia has the cachebuster in the wgExtensionPath (we rewrite that in varnish because many proxies won't cache things that have "?" in the URL), but other MediaWikis need the style-version in the querystring. - $cbSuffix = ( isset( $wgCityId ) ? "?{$wgStyleVersion}" : "" ); - $wgOut->addScript( "<script type=\"text/javascript\" src=\"{$wgExtensionsPath}/wikia/JavascriptAPI/Mediawiki.js{$cbSuffix}\"></script>" ); - $wgOut->addScript( "<script type=\"text/javascript\" src=\"{$wgExtensionsPath}/ApiExplorer/apiExplorer.js{$cbSuffix}\"></script>" ); - $wgOut->addScript( "<link rel=\"stylesheet\" type=\"text/css\" href=\"{$wgExtensionsPath}/ApiExplorer/apiExplorer.css{$cbSuffix}\" />" ); + $wgOut->addScript( "<script type=\"text/javascript\" src=\"{$wgExtensionsPath}/wikia/JavascriptAPI/Mediawiki.js\"></script>" ); + $wgOut->addScript( "<script type=\"text/javascript\" src=\"{$wgExtensionsPath}/ApiExplorer/apiExplorer.js\"></script>" ); + $wgOut->addScript( "<link rel=\"stylesheet\" type=\"text/css\" href=\"{$wgExtensionsPath}/ApiExplorer/apiExplorer.css\" />" ); ob_start(); $buttonHeight = 15; - $collapseSrc = "$wgExtensionsPath/ApiExplorer/collapse.png$cbSuffix"; - $expandSrc = "$wgExtensionsPath/ApiExplorer/collapse.png$cbSuffix"; ?><style> .collapsible h2 span, .collapsible h3 span{ width:<?= $buttonHeight ?>px; @@ -68,10 +63,10 @@ background-repeat:no-repeat; background-position:right center; - background-image: url(<?= "$wgExtensionsPath/ApiExplorer/collapse.png$cbSuffix"; ?>); + background-image: url(<?= "$wgExtensionsPath/ApiExplorer/collapse.png"; ?>); } .collapsed h2 span, .collapsed h3 span{ - background-image: url(<?= "$wgExtensionsPath/ApiExplorer/expand.png$cbSuffix"; ?>); + background-image: url(<?= "$wgExtensionsPath/ApiExplorer/expand.png"; ?>); } </style> <div id='apEx_intro'> -- To view, visit https://gerrit.wikimedia.org/r/393665 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8ba1eebc9f6a57d2f0e572ebbc4c8789e92159fd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ApiExplorer Gerrit-Branch: master Gerrit-Owner: Reedy <re...@wikimedia.org> Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits