From 08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Mon, 12 Aug 2013 09:28:15 +0200 Subject: Update to MediaWiki 1.21.1 --- includes/specials/SpecialJavaScriptTest.php | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'includes/specials/SpecialJavaScriptTest.php') diff --git a/includes/specials/SpecialJavaScriptTest.php b/includes/specials/SpecialJavaScriptTest.php index c217eccb..d204d50c 100644 --- a/includes/specials/SpecialJavaScriptTest.php +++ b/includes/specials/SpecialJavaScriptTest.php @@ -40,19 +40,11 @@ class SpecialJavaScriptTest extends SpecialPage { } public function execute( $par ) { - global $wgEnableJavaScriptTest; - $out = $this->getOutput(); $this->setHeaders(); $out->disallowUserJs(); - // Abort early if we're disabled - if ( $wgEnableJavaScriptTest !== true ) { - $out->addWikiMsg( 'javascripttest-disabled' ); - return; - } - $out->addModules( 'mediawiki.special.javaScriptTest' ); // Determine framework @@ -110,8 +102,9 @@ class SpecialJavaScriptTest extends SpecialPage { * Function to wrap the summary. * It must be given a valid state as a second parameter or an exception will * be thrown. - * @param $html String: The raw HTML. - * @param $state String: State, one of 'noframework', 'unknownframework' or 'frameworkfound' + * @param string $html The raw HTML. + * @param string $state State, one of 'noframework', 'unknownframework' or 'frameworkfound' + * @throws MWException * @return string */ private function wrapSummaryHtml( $html, $state ) { @@ -165,9 +158,7 @@ HTML; $out->addJsConfigVars( 'QUnitTestSwarmInjectJSPath', $wgJavaScriptTestConfig['qunit']['testswarm-injectjs'] ); } - public function isListed(){ - global $wgEnableJavaScriptTest; - return $wgEnableJavaScriptTest === true; + protected function getGroupName() { + return 'other'; } - } -- cgit v1.2.3-54-g00ecf