From 0d81130dd47970a71871dae4ff1f625ff6f33014 Mon Sep 17 00:00:00 2001
From: umherirrender <umherirrender_de.wp@web.de>
Date: Mon, 24 Sep 2012 20:04:26 +0200
Subject: [PATCH] Do not register Special:JavaScriptTest, if disabled

It is better when the special page is not register,
instead of giving a hint, that this is disabled on the wiki.

See other special pages like Special:PopularPages or Special:ChangeEmail

Change-Id: I43fb118d61ddcb2536192f54ee888d55b2fbd49d
---
 includes/SpecialPageFactory.php             |  7 +++++--
 includes/specials/SpecialJavaScriptTest.php | 14 --------------
 languages/messages/MessagesEn.php           |  1 -
 maintenance/language/messages.inc           |  1 -
 4 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/includes/SpecialPageFactory.php b/includes/SpecialPageFactory.php
index 95f75a8ef7..8ed52642a7 100644
--- a/includes/SpecialPageFactory.php
+++ b/includes/SpecialPageFactory.php
@@ -155,7 +155,6 @@ class SpecialPageFactory {
 		'Blankpage'                 => 'SpecialBlankpage',
 		'Blockme'                   => 'SpecialBlockme',
 		'Emailuser'                 => 'SpecialEmailUser',
-		'JavaScriptTest'            => 'SpecialJavaScriptTest',
 		'Movepage'                  => 'MovePageForm',
 		'Mycontributions'           => 'SpecialMycontributions',
 		'Mypage'                    => 'SpecialMypage',
@@ -178,7 +177,7 @@ class SpecialPageFactory {
 	static function getList() {
 		global $wgSpecialPages;
 		global $wgDisableCounters, $wgDisableInternalSearch, $wgEmailAuthentication;
-		global $wgEnableEmail;
+		global $wgEnableEmail, $wgEnableJavaScriptTest;
 
 		if ( !is_object( self::$mList ) ) {
 			wfProfileIn( __METHOD__ );
@@ -200,6 +199,10 @@ class SpecialPageFactory {
 				self::$mList['ChangeEmail'] = 'SpecialChangeEmail';
 			}
 
+			if( $wgEnableJavaScriptTest ) {
+				self::$mList['JavaScriptTest'] = 'SpecialJavaScriptTest';
+			}
+
 			// Add extension special pages
 			self::$mList = array_merge( self::$mList, $wgSpecialPages );
 
diff --git a/includes/specials/SpecialJavaScriptTest.php b/includes/specials/SpecialJavaScriptTest.php
index c217eccbcd..b32b0ca348 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
@@ -164,10 +156,4 @@ HTML;
 		// $wgJavaScriptTestConfig in DefaultSettings.php
 		$out->addJsConfigVars( 'QUnitTestSwarmInjectJSPath', $wgJavaScriptTestConfig['qunit']['testswarm-injectjs'] );
 	}
-
-	public function isListed(){
-		global $wgEnableJavaScriptTest;
-		return $wgEnableJavaScriptTest === true;
-	}
-
 }
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 097199b293..d7d3beb55e 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -3524,7 +3524,6 @@ Please try again.',
 # JavaScriptTest
 'javascripttest'                           => 'JavaScript testing',
 'javascripttest-backlink'                  => '< $1', # do not translate or duplicate this message to other languages
-'javascripttest-disabled'                  => 'This function has not been enabled on this wiki.',
 'javascripttest-title'                     => 'Running $1 tests',
 'javascripttest-pagetext-noframework'      => 'This page is reserved for running JavaScript tests.',
 'javascripttest-pagetext-unknownframework' => 'Unknown testing framework "$1".',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index b644d8e6f0..0a723bca94 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -2453,7 +2453,6 @@ $wgMessageStructure = array(
 	'javaccripttest' => array(
 		'javascripttest',
 		'javascripttest-backlink',
-		'javascripttest-disabled',
 		'javascripttest-title',
 		'javascripttest-pagetext-noframework',
 		'javascripttest-pagetext-unknownframework',
-- 
2.20.1