From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 17 Jan 2007 10:07:40 +0000 (+0000)
Subject: * (bug 8638) Fix update from 1.4 and earlier
X-Git-Tag: 1.31.0-rc.0~54348
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=ac29143f60a3a8b40c5c969a3d507f9bd3bf3c02;p=lhc%2Fweb%2Fwiklou.git

* (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 c59b3febd1..cf31eb4c15 100644
--- 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 38e28bfa89..25c3cfc8ee 100644
--- 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 ();