From: Chad Horohoe <chadh@wikimedia.org>
Date: Wed, 29 Jan 2014 23:08:19 +0000 (-0800)
Subject: Remove vestiges of AdminSettings.php
X-Git-Tag: 1.31.0-rc.0~17074^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=commitdiff_plain;h=4d6dad7100c346ec88dfd899e6da0c9a8db92bb7;p=lhc%2Fweb%2Fwiklou.git

Remove vestiges of AdminSettings.php

This has been deprecated and mostly unused for quite some time.
Remove the few remaining uses that exist.

Change-Id: I522ef138d291cf7567250fef1de34bb41673bc6c
---

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 528c4016e6..cd602a1d58 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -32,6 +32,8 @@ production.
   the system message 'emailsender' should be modified (default: "{{SITENAME}}").
 * $wgDBAhandler was removed as the only class using it was also removed
 * The 'max threads' setting was removed from $wgDBservers.
+* Support for AdminSettings.php has been completely removed. All configuration
+  belongs in LocalSettings.php.
 
 === New features in 1.23 ===
 * ResourceLoader can utilize the Web Storage API to cache modules client-side.
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 8b15f0cc29..79a42baf45 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -505,8 +505,7 @@ abstract class Installer {
 	}
 
 	/**
-	 * Determine if LocalSettings.php exists. If it does, return its variables,
-	 * merged with those from AdminSettings.php, as an array.
+	 * Determine if LocalSettings.php exists. If it does, return its variables.
 	 *
 	 * @return Array
 	 */
@@ -524,9 +523,6 @@ abstract class Installer {
 
 		require "$IP/includes/DefaultSettings.php";
 		require "$IP/LocalSettings.php";
-		if ( file_exists( "$IP/AdminSettings.php" ) ) {
-			require "$IP/AdminSettings.php";
-		}
 
 		return get_defined_vars();
 	}
diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index d4b3d65713..67236e566c 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -380,7 +380,7 @@ class WebInstaller_ExistingWiki extends WebInstallerPage {
 
 	/**
 	 * Initiate an upgrade of the existing database
-	 * @param array $vars Variables from LocalSettings.php and AdminSettings.php
+	 * @param array $vars Variables from LocalSettings.php
 	 * @return Status
 	 */
 	protected function handleExistingUpgrade( $vars ) {
diff --git a/maintenance/checkSyntax.php b/maintenance/checkSyntax.php
index dc8626dfea..297c9723ba 100644
--- a/maintenance/checkSyntax.php
+++ b/maintenance/checkSyntax.php
@@ -153,9 +153,6 @@ class CheckSyntax extends Maintenance {
 		if ( file_exists( "$IP/LocalSettings.php" ) ) {
 			$this->mFiles[] = "$IP/LocalSettings.php";
 		}
-		if ( file_exists( "$IP/AdminSettings.php" ) ) {
-			$this->mFiles[] = "$IP/AdminSettings.php";
-		}
 
 		$this->output( 'done.', 'listfiles' );
 	}
diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index 3dcf12cef0..978d44f586 100644
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -90,12 +90,6 @@ if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
 	require $maintenance->loadSettings();
 }
 
-if ( $maintenance->getDbType() === Maintenance::DB_ADMIN
-	&& is_readable( "$IP/AdminSettings.php" )
-) {
-	require "$IP/AdminSettings.php";
-}
-
 if ( $maintenance->getDbType() === Maintenance::DB_NONE ) {
 	if ( $wgLocalisationCacheConf['storeClass'] === false && ( $wgLocalisationCacheConf['store'] == 'db' || ( $wgLocalisationCacheConf['store'] == 'detect' && !$wgCacheDirectory ) ) ) {
 		$wgLocalisationCacheConf['storeClass'] = 'LCStoreNull';