* (bug 8638) Fix update from 1.4 and earlier

The 'redirect' table was created in too early a stage of setup, trying to read from tables which hadn't yet been created. Moved it to proper stage of do_all_updates()

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c59b3fe..cf31eb4 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -100,6 +100,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Add title prefix search for Special:Undelete
 * Remove full-archive list from Special:Undelete
 * Undelete page list can use plural marker
+* (bug 8638) Fix update from 1.4 and earlier
 
 
 == Languages updated ==

diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index 38e28bf..25c3cfc 100644 (file)
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -35,7 +35,6 @@ $wgNewTables = array(
        array( 'langlinks',     'patch-langlinks.sql' ),
        array( 'querycache_info', 'patch-querycacheinfo.sql' ),
        array( 'filearchive',   'patch-filearchive.sql' ),
-       array( 'redirect',      'patch-redirect.sql' ),
        array( 'querycachetwo', 'patch-querycachetwo.sql' ),
 );
 
@@ -917,7 +916,9 @@ function do_all_updates( $shared = false, $purge = true ) {
        do_page_random_update(); flush();
        
        do_rc_indices_update(); flush();
-       
+
+       add_table( 'redirect', 'patch-redirect.sql' );
+
        do_backlinking_indices_update(); flush();
 
        do_restrictions_update(); flush ();