Bug 30934 - Warning: Invalid argument supplied for foreach() in /languages/Language...

Doing a run of doRebuildLocalisationCache on each run of update.php

diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index b21f694..1d2897b 100644 (file)
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -619,4 +619,13 @@ abstract class DatabaseUpdater {
                $cl->execute();
                $this->output( "done.\n" );
        }
+
+       protected function doRebuildLocalisationCache() {
+               global $wgLocalisationCacheConf;
+               $wgLocalisationCacheConf['forceRecache'] = true;
+               $cl = $this->maintenance->runChild( 'RebuildLocalisationCache', 'rebuildLocalisationCache.php' );
+               $this->output( "Rebuilding Localisation Cache... " );
+               $cl->execute();
+               $this->output( "done.\n" );
+       }
 }

diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index 30715fd..ad6f7fa 100644 (file)
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -181,6 +181,7 @@ 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 ebc1518..027244c 100644 (file)
--- a/includes/installer/OracleUpdater.php
+++ b/includes/installer/OracleUpdater.php
@@ -36,6 +36,7 @@ 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' ),
@@ -43,7 +44,7 @@ class OracleUpdater extends DatabaseUpdater {
                        array( 'addTable', 'globaltemplatelinks', 'patch-globaltemplatelinks.sql' ),
                        array( 'addTable', 'globalnamespaces', 'patch-globalnamespaces.sql' ),
                        array( 'addTable', 'globalinterwiki', 'patch-globalinterwiki.sql' ),
-                       
+
                        // till 2.0 i guess
                        array( 'doRebuildDuplicateFunction' ),
 

diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php
index 19e12c5..2520a0f 100644 (file)
--- a/includes/installer/SqliteUpdater.php
+++ b/includes/installer/SqliteUpdater.php
@@ -59,6 +59,7 @@ 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' ),