Followup r111006

Move config to 1.20 changes

Move release notes for reverted bugs from 1.19 to 1.20

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index c7a3387..d4eeaa9 100644 (file)
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -151,7 +151,6 @@ production.
 * Allow moving the associated talk pages of subpages even if the base page
   has no subpage.
 * Per page edit-notices now work in namespaces without subpages enabled.
-* (bug 30245) Use the correct way to construct a log page title.
 * (bug 31081) $wgEnotifUseJobQ caused many unnecessary jobs to be queued.
 * (bug 30202) File names are now restricted on upload to 240 bytes, because of
   restrictions on some of the database fields.

diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index 2122380..6fedda9 100644 (file)
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -15,6 +15,9 @@ production.
 === New features in 1.20 ===
 
 === Bug fixes in 1.20 ===
+* (bug 30245) Use the correct way to construct a log page title.
+* (bug 34237) Regenerate an empty user_token and save to the database
+  when we try to set the user's cookies for login.
 
 === API changes in 1.20 ===
 

diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index 07b76e8..1c2937a 100644 (file)
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -182,7 +182,6 @@ class MysqlUpdater extends DatabaseUpdater {
                        array( 'addTable', 'user_former_groups',                'patch-user_former_groups.sql'),
 
                        // 1.19
-                       array( 'addTable', 'config',                            'patch-config.sql' ),
                        array( 'addIndex', 'logging',       'type_action',      'patch-logging-type-action-index.sql'),
                        array( 'doMigrateUserOptions' ),
                        array( 'dropField', 'user',         'user_options', 'patch-drop-user_options.sql' ),
@@ -193,6 +192,9 @@ class MysqlUpdater extends DatabaseUpdater {
                        array( 'addField',      'uploadstash',  'us_chunk_inx',         'patch-uploadstash_chunk.sql' ),
                        array( 'addfield', 'job',           'job_timestamp',    'patch-jobs-add-timestamp.sql' ),
                        array( 'modifyField', 'user_former_groups', 'ufg_group', 'patch-ufg_group-length-increase.sql' ),
+
+                       // 1.20
+                       array( 'addTable', 'config',                            'patch-config.sql' ),
                );
        }
 

diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php
index 542a057..2d9d00a 100644 (file)
--- a/includes/installer/SqliteUpdater.php
+++ b/includes/installer/SqliteUpdater.php
@@ -61,7 +61,6 @@ class SqliteUpdater extends DatabaseUpdater {
                        array( 'addTable', 'user_former_groups',                'patch-user_former_groups.sql'),
 
                        // 1.19
-                       array( 'addTable', 'config',                            'patch-config.sql' ),
                        array( 'addIndex', 'logging',       'type_action',      'patch-logging-type-action-index.sql'),
                        array( 'doMigrateUserOptions' ),
                        array( 'dropField', 'user',         'user_options', 'patch-drop-user_options.sql' ),
@@ -72,6 +71,9 @@ class SqliteUpdater extends DatabaseUpdater {
                        array( 'addField',      'uploadstash',  'us_chunk_inx',         'patch-uploadstash_chunk.sql' ),
                        array( 'addfield', 'job',           'job_timestamp',    'patch-jobs-add-timestamp.sql' ),
                        array( 'modifyField', 'user_former_groups', 'ufg_group', 'patch-ug_group-length-increase.sql' ),
+
+                       // 1.20
+                       array( 'addTable', 'config',                            'patch-config.sql' ),
                );
        }