From 51fa22e99859541f435abf18235d8347d1bf4e70 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 17 Jan 2007 11:51:01 +0000 Subject: [PATCH] * (bug 8641) Fix order of updates to ipblocks table The update for ipb_anon_only does a total replacement of the ipblocks table in order to apply a unique index at the same time. A later change, adding the ipb_enable_autoblock field, was erroneously listed _before_ this change in the updates list. As a result, upgrades from 1.7 or earlier would end up missing this field as the ipb_anon_only update's new copy of the table dropped the field. A second updater run would restore it, but this should no longer be necessary. --- RELEASE-NOTES | 1 + maintenance/updaters.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index d2476ee417..2d24596632 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -103,6 +103,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * (bug 8638) Fix update from 1.4 and earlier * Allow restriction of autoconfirmed permission by edit count. New global setting $wgAutoConfirmCount (defaulting to zero, naturally). +* (bug 8641) Fix order of updates to ipblocks table == Languages updated == diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc index 25c3cfc8ee..72e00bf8e7 100644 --- a/maintenance/updaters.inc +++ b/maintenance/updaters.inc @@ -42,7 +42,6 @@ $wgNewFields = array( # table field patch file (in maintenance/archives) array( 'ipblocks', 'ipb_id', 'patch-ipblocks.sql' ), array( 'ipblocks', 'ipb_expiry', 'patch-ipb_expiry.sql' ), - array( 'ipblocks', 'ipb_enable_autoblock', 'patch-ipb_optional_autoblock.sql' ), array( 'recentchanges', 'rc_type', 'patch-rc_type.sql' ), array( 'recentchanges', 'rc_ip', 'patch-rc_ip.sql' ), array( 'recentchanges', 'rc_id', 'patch-rc_id.sql' ), @@ -65,6 +64,7 @@ $wgNewFields = array( array( 'ipblocks', 'ipb_range_start', 'patch-ipb_range_start.sql' ), array( 'site_stats', 'ss_images', 'patch-ss_images.sql' ), array( 'ipblocks', 'ipb_anon_only', 'patch-ipb_anon_only.sql' ), + array( 'ipblocks', 'ipb_enable_autoblock', 'patch-ipb_optional_autoblock.sql' ), array( 'user', 'user_newpass_time','patch-user_newpass_time.sql' ), array( 'user', 'user_editcount', 'patch-user_editcount.sql' ), ); -- 2.20.1