From 17ad472958e9953d62ee43fb698a1a368a3ae25b Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 19 Aug 2009 23:40:48 +0000 Subject: [PATCH] De-clutter base directory; moving install-utils.inc into maintenance. --- config/Installer.php | 3 +-- maintenance/commandLine.inc | 2 +- maintenance/doMaintenance.php | 2 +- install-utils.inc => maintenance/install-utils.inc | 0 4 files changed, 3 insertions(+), 4 deletions(-) rename install-utils.inc => maintenance/install-utils.inc (100%) diff --git a/config/Installer.php b/config/Installer.php index 76e7ae7dbc..4967790f59 100644 --- a/config/Installer.php +++ b/config/Installer.php @@ -32,7 +32,7 @@ $wgRequestTime = microtime( true ); // Run version checks before including other files // so people don't see a scary parse error. -require_once( "$IP/install-utils.inc" ); +require_once( "$IP/maintenance/install-utils.inc" ); install_version_checks(); require_once( "$IP/includes/Defines.php" ); @@ -250,7 +250,6 @@ if( !is_writable( "." ) ) { } -require_once( "$IP/install-utils.inc" ); require_once( "$IP/maintenance/updaters.inc" ); class ConfigData { diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc index b4fcbe4b7c..15a37c8857 100644 --- a/maintenance/commandLine.inc +++ b/maintenance/commandLine.inc @@ -257,7 +257,7 @@ if( version_compare( phpversion(), '5.2.4' ) >= 0 ) { $wgShowSQLErrors = true; require_once( "$IP/includes/Setup.php" ); -require_once( "$IP/install-utils.inc" ); +require_once( "$IP/maintenance/install-utils.inc" ); $wgTitle = null; # Much much faster startup than creating a title object @set_time_limit(0); diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php index c5df5b9c32..a4afe07bf9 100644 --- a/maintenance/doMaintenance.php +++ b/maintenance/doMaintenance.php @@ -75,7 +75,7 @@ if( file_exists( dirname(__FILE__).'/wikimedia-mode' ) ) { $maintenance->finalSetup(); // Some last includes require_once( "$IP/includes/Setup.php" ); -require_once( "$IP/install-utils.inc" ); +require_once( "$IP/maintenance/install-utils.inc" ); // Much much faster startup than creating a title object $wgTitle = null; diff --git a/install-utils.inc b/maintenance/install-utils.inc similarity index 100% rename from install-utils.inc rename to maintenance/install-utils.inc -- 2.20.1