Follow-up r101449 and friends: no need to consider LC rebuild a database update and...

diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index f86cd5c..c8f5b50 100644 (file)
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -237,6 +237,7 @@ abstract class DatabaseUpdater {
 
                if( isset( $what['purge'] ) ) {
                        $this->purgeCache();
+                       $this->rebuildLocalisationCache();
                }
                if ( isset( $what['stats'] ) ) {
                        $this->checkStats();
@@ -652,7 +653,7 @@ abstract class DatabaseUpdater {
        /**
         * Rebuilds the localisation cache
         */
-       protected function doRebuildLocalisationCache() {
+       protected function rebuildLocalisationCache() {
                /**
                 * @var $cl RebuildLocalisationCache
                 */

diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index d0ab412..5862aaf 100644 (file)
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -181,7 +181,6 @@ class MysqlUpdater extends DatabaseUpdater {
                        array( 'modifyField', 'user_properties', 'up_property', 'patch-up_property.sql' ),
                        array( 'addTable', 'uploadstash',                       'patch-uploadstash.sql' ),
                        array( 'addTable', 'user_former_groups',                'patch-user_former_groups.sql'),
-                       array( 'doRebuildLocalisationCache' ),
 
                        // 1.19
                        array( 'addTable', 'config',                            'patch-config.sql' ),

diff --git a/includes/installer/OracleUpdater.php b/includes/installer/OracleUpdater.php
index 4898ca9..72fd9e0 100644 (file)
--- a/includes/installer/OracleUpdater.php
+++ b/includes/installer/OracleUpdater.php
@@ -36,7 +36,6 @@ class OracleUpdater extends DatabaseUpdater {
                        array( 'addIndex',      'user',          'i02',       'patch-user_email_index.sql' ),
                        array( 'modifyField', 'user_properties', 'up_property', 'patch-up_property.sql' ),
                        array( 'addTable', 'uploadstash', 'patch-uploadstash.sql' ),
-                       array( 'doRebuildLocalisationCache' ),
 
                        //1.19
                        array( 'addTable', 'config', 'patch-config.sql' ),

diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php
index 2dc1505..1b517a2 100644 (file)
--- a/includes/installer/SqliteUpdater.php
+++ b/includes/installer/SqliteUpdater.php
@@ -59,7 +59,6 @@ class SqliteUpdater extends DatabaseUpdater {
                        array( 'addIndex', 'user',          'user_email',       'patch-user_email_index.sql' ),
                        array( 'addTable', 'uploadstash',                       'patch-uploadstash.sql' ),
                        array( 'addTable', 'user_former_groups',                'patch-user_former_groups.sql'),
-                       array( 'doRebuildLocalisationCache' ),
 
                        // 1.19
                        array( 'addTable', 'config',                            'patch-config.sql' ),