(bug 19447) Disable the localisation store backend during install and update.

diff --git a/config/index.php b/config/index.php
index c2a478b..c207069 100644 (file)
--- a/config/index.php
+++ b/config/index.php
@@ -831,6 +831,8 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                        define( 'STDERR', fopen("php://stderr", "wb"));
                $wgUseDatabaseMessages = false; /* FIXME: For database failure */
                require_once( "$IP/includes/Setup.php" );
+               Language::getLocalisationCache()->disableBackend();
+               
                chdir( "config" );
 
                $wgTitle = Title::newFromText( "Installation script" );

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index aef9297..82743f3 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -117,6 +117,7 @@ $wgAutoloadLocalClasses = array(
        'Job' => 'includes/JobQueue.php',
        'LCStore_DB' => 'includes/LocalisationCache.php',
        'LCStore_CDB' => 'includes/LocalisationCache.php',
+       'LCStore_Null' => 'includes/LocalisationCache.php',
        'License' => 'includes/Licenses.php',
        'Licenses' => 'includes/Licenses.php',
        'LinkBatch' => 'includes/LinkBatch.php',

diff --git a/includes/LocalisationCache.php b/includes/LocalisationCache.php
index d5ad424..0974f4a 100644 (file)
--- a/includes/LocalisationCache.php
+++ b/includes/LocalisationCache.php
@@ -648,6 +648,13 @@ class LocalisationCache {
                        }
                }
        }
+
+       /**
+        * Disable the storage backend
+        */
+       public function disableBackend() {
+               $this->store = new LCStore_Null;
+       }
 }
 
 /**
@@ -824,6 +831,19 @@ class LCStore_CDB implements LCStore {
        }
 }
 
+/**
+ * Null store backend, used to avoid DB errors during install
+ */
+class LCStore_Null implements LCStore {
+       public function get( $code, $key ) {
+               return null;
+       }
+
+       public function startWrite( $code ) {}
+       public function finishWrite() {}
+       public function set( $key, $value ) {}
+}
+
 /**
  * A localisation cache optimised for loading large amounts of data for many 
  * languages. Used by rebuildLocalisationCache.php.

diff --git a/maintenance/update.php b/maintenance/update.php
index 8816f94..6c52ef1 100644 (file)
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -13,6 +13,11 @@
 $wgUseMasterForMaintenance = true;
 require( "commandLine.inc" );
 require( "updaters.inc" );
+
+# Don't try to load stuff from l10n_cache yet
+$lc = Language::getLocalisationCache();
+$lc->disableBackend();
+
 $wgTitle = Title::newFromText( "MediaWiki database updater" );
 
 echo( "MediaWiki {$wgVersion} Updater\n\n" );