http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72727
Revision: 72727
Author: ialex
Date: 2010-09-10 16:53:35 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
Use the AutoLoader instead of manually requiring these files
Modified Paths:
--------------
trunk/phase3/includes/AutoLoader.php
trunk/phase3/maintenance/FiveUpgrade.inc
trunk/phase3/maintenance/updaters.inc
Modified: trunk/phase3/includes/AutoLoader.php
===================================================================
--- trunk/phase3/includes/AutoLoader.php 2010-09-10 16:47:42 UTC (rev
72726)
+++ trunk/phase3/includes/AutoLoader.php 2010-09-10 16:53:35 UTC (rev
72727)
@@ -678,6 +678,7 @@
# maintenance
'AnsiTermColorer' => 'maintenance/parserTests.inc',
+ 'ConvertLinks' => 'maintenance/convertLinks.php',
'DbTestPreviewer' => 'maintenance/parserTests.inc',
'DbTestRecorder' => 'maintenance/parserTests.inc',
'DeleteArchivedFilesImplementation' =>
'maintenance/deleteArchivedFiles.inc',
@@ -687,11 +688,18 @@
'ParserTest' => 'maintenance/parserTests.inc',
'ParserTestParserHook' => 'maintenance/parserTestsParserHook.php',
'ParserTestStaticParserHook' =>
'maintenance/parserTestsStaticParserHook.php',
+ 'PopulateCategory' => 'maintenance/populateCategory.php',
+ 'PopulateLogSearch' => 'maintenance/populateLogSearch.php',
+ 'PopulateParentId' => 'maintenance/populateParentId.php',
+ 'PopulateRevisionLength' => 'maintenance/populateRevisionLength.php',
'RemoteTestRecorder' => 'maintenance/parserTests.inc',
'SevenZipStream' => 'maintenance/7zip.inc',
'Sqlite' => 'maintenance/sqlite.inc',
'TestFileIterator' => 'maintenance/parserTests.inc',
'TestRecorder' => 'maintenance/parserTests.inc',
+ 'UpdateCollation' => 'maintenance/updateCollation.php',
+ 'UpdateRestrictions' => 'maintenance/updateRestrictions.php',
+ 'UserDupes' => 'maintenance/userDupes.inc',
# maintenance/tests/selenium
'SimpleSeleniumTestSuite' =>
'maintenance/tests/selenium/SimpleSeleniumTestSuite.php',
Modified: trunk/phase3/maintenance/FiveUpgrade.inc
===================================================================
--- trunk/phase3/maintenance/FiveUpgrade.inc 2010-09-10 16:47:42 UTC (rev
72726)
+++ trunk/phase3/maintenance/FiveUpgrade.inc 2010-09-10 16:53:35 UTC (rev
72727)
@@ -5,7 +5,6 @@
*/
require_once( 'cleanupDupes.inc' );
-require_once( 'userDupes.inc' );
require_once( 'updaters.inc' );
define( 'MW_UPGRADE_COPY', false );
Modified: trunk/phase3/maintenance/updaters.inc
===================================================================
--- trunk/phase3/maintenance/updaters.inc 2010-09-10 16:47:42 UTC (rev
72726)
+++ trunk/phase3/maintenance/updaters.inc 2010-09-10 16:53:35 UTC (rev
72727)
@@ -393,10 +393,6 @@
}
function do_old_links_update() {
- if( !defined( 'MW_NO_SETUP' ) ) {
- define( 'MW_NO_SETUP', true );
- }
- require( "convertLinks.php" );
$cl = new ConvertLinks();
$cl->execute();
}
@@ -416,7 +412,6 @@
function do_user_unique_update() {
$dbw = wfGetDB( DB_MASTER );
- require_once( "userDupes.inc" );
$duper = new UserDupes( $dbw );
if ( $duper->hasUniqueIndex() ) {
wfOut( "...already have unique user_name index.\n" );
@@ -710,7 +705,6 @@
wfOut( "ok\n" );
wfOut( "Migrating old restrictions to new table...\n" );
- require_once( 'updateRestrictions.php' );
$task = new UpdateRestrictions();
$task->execute();
}
@@ -721,7 +715,7 @@
wfOut( "...category table already populated.\n" );
return;
}
- require_once( 'populateCategory.php' );
+
wfOut(
"Populating category table, printing progress markers. " .
"For large databases, you\n" .
@@ -738,7 +732,7 @@
wfOut( "...rev_parent_id column already populated.\n" );
return;
}
- require_once( 'populateParentId.php' );
+
$task = new PopulateParentId();
$task->execute();
}
@@ -748,7 +742,7 @@
wfOut( "...rev_len column already populated.\n" );
return;
}
- require_once( 'populateRevisionLength.php' );
+
$task = new PopulateRevisionLength();
$task->execute();
}
@@ -775,7 +769,7 @@
wfOut( "...collations up-to-date.\n" );
return;
}
- require_once( 'updateCollation.php' );
+
$task = new UpdateCollation();
$task->execute();
}
@@ -826,7 +820,6 @@
wfOut( "...log_search table already populated.\n" );
return;
}
- require_once( 'populateLogSearch.php' );
wfOut(
"Populating log_search table, printing progress markers. For large\n" .
"databases, you may want to hit Ctrl-C and do this manually with\n" .
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
