From a019d9fa839c9eea476cb14571412b21a43189d2 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Sun, 1 Jan 2012 15:44:42 +0000 Subject: [PATCH] Always set 'jsvarurl' to false (only affect skins not using OutputPage::headElement()) since action=raw&gen=js always return an empty page, so it's pointless to link to it --- includes/SkinTemplate.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php index e99fd25ed2..7da8bc3489 100644 --- a/includes/SkinTemplate.php +++ b/includes/SkinTemplate.php @@ -139,7 +139,7 @@ class SkinTemplate extends Skin { global $wgDisableCounters, $wgSitename, $wgLogo, $wgHideInterlanguageLinks; global $wgMaxCredits, $wgShowCreditsIfMax; global $wgPageShowWatchingUsers; - global $wgUseSiteJs, $wgDebugComments; + global $wgDebugComments; global $wgArticlePath, $wgScriptPath, $wgServer; wfProfileIn( __METHOD__ ); @@ -201,15 +201,7 @@ class SkinTemplate extends Skin { $tpl->setRef( 'userjs', $this->userjs ); $tpl->setRef( 'userjsprev', $this->userjsprev ); - if( $wgUseSiteJs ) { - $jsCache = $this->loggedin ? '&smaxage=0' : ''; - $tpl->set( 'jsvarurl', - self::makeUrl( '-', - "action=raw$jsCache&gen=js&useskin=" . - urlencode( $this->getSkinName() ) ) ); - } else { - $tpl->set( 'jsvarurl', false ); - } + $tpl->set( 'jsvarurl', false ); $tpl->setRef( 'xhtmldefaultnamespace', $wgXhtmlDefaultNamespace ); $tpl->set( 'xhtmlnamespaces', $wgXhtmlNamespaces ); -- 2.20.1