From 5e3229b1a8bb6522b370a7ad486f5854a4c7f6e0 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Mon, 10 Feb 2014 17:59:47 -0800 Subject: [PATCH] Remove $wgMaintenanceScripts and friends Nothing ever used it--and rightly so--as it's completely useless. Change-Id: I2746500c8156cc4e7834f2b811581144a35cb6e0 --- includes/DefaultSettings.php | 7 ----- maintenance/Maintenance.php | 53 ------------------------------------ 2 files changed, 60 deletions(-) diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index d0ceafcec6..5ce31fd263 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -5429,13 +5429,6 @@ if ( !isset( $wgCommandLineMode ) ) { */ $wgCommandLineDarkBg = false; -/** - * Array for extensions to register their maintenance scripts with the - * system. The key is the name of the class and the value is the full - * path to the file - */ -$wgMaintenanceScripts = array(); - /** * Set this to a string to put the wiki into read-only mode. The text will be * used as an explanation to users. diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php index fb2cd8c68f..d9ef350414 100644 --- a/maintenance/Maintenance.php +++ b/maintenance/Maintenance.php @@ -114,13 +114,6 @@ abstract class Maintenance { */ public $fileHandle; - /** - * List of all the core maintenance scripts. This is added - * to scripts added by extensions in $wgMaintenanceScripts - * and returned by getMaintenanceScripts() - */ - protected static $mCoreScripts = null; - /** * Default constructor. Children should call this *first* if implementing * their own constructors @@ -1007,52 +1000,6 @@ abstract class Maintenance { return __DIR__; } - /** - * Get the list of available maintenance scripts. Note - * that if you call this _before_ calling doMaintenance - * you won't have any extensions in it yet - * @return Array - */ - public static function getMaintenanceScripts() { - global $wgMaintenanceScripts; - return $wgMaintenanceScripts + self::getCoreScripts(); - } - - /** - * Return all of the core maintenance scripts - * @return array - */ - protected static function getCoreScripts() { - if ( !self::$mCoreScripts ) { - $paths = array( - __DIR__, - __DIR__ . '/language', - __DIR__ . '/storage', - ); - self::$mCoreScripts = array(); - foreach ( $paths as $p ) { - $handle = opendir( $p ); - while ( ( $file = readdir( $handle ) ) !== false ) { - if ( $file == 'Maintenance.php' ) { - continue; - } - $file = $p . '/' . $file; - if ( is_dir( $file ) || !strpos( $file, '.php' ) || - ( strpos( file_get_contents( $file ), '$maintClass' ) === false ) ) { - continue; - } - require $file; - $vars = get_defined_vars(); - if ( array_key_exists( 'maintClass', $vars ) ) { - self::$mCoreScripts[$vars['maintClass']] = $file; - } - } - closedir( $handle ); - } - } - return self::$mCoreScripts; - } - /** * Returns a database to be used by current maintenance script. It can be set by setDB(). * If not set, wfGetDB() will be used. -- 2.20.1