Merge "Turn MessageBlobStore into a singleton instead of static functions"

diff --combined includes/cache/LocalisationCache.php
index b8be6e4,5214ab2..bdfe510
--- 1/includes/cache/LocalisationCache.php
--- 2/includes/cache/LocalisationCache.php
+++ b/includes/cache/LocalisationCache.php
@@@ -686,7 -686,6 +686,7 @@@ class LocalisationCache 
         *
         * @param string $code
         * @param array $deps
 +       * @return array
         */
        protected function readSourceFilesAndRegisterDeps( $code, &$deps ) {
                global $IP;
@@@ -984,7 -983,7 +984,7 @@@
                # HACK: If using a null (i.e. disabled) storage backend, we
                # can't write to the MessageBlobStore either
                if ( $purgeBlobs && !$this->store instanceof LCStoreNull ) {
-                       MessageBlobStore::clear();
+                       MessageBlobStore::getInstance()->clear();
                }
  
                wfProfileOut( __METHOD__ );

diff --combined includes/installer/DatabaseUpdater.php
index b501428,cd34f3a..193d592
--- 1/includes/installer/DatabaseUpdater.php
--- 2/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@@ -907,7 -907,7 +907,7 @@@ abstract class DatabaseUpdater 
                if ( $wgLocalisationCacheConf['manualRecache'] ) {
                        $this->rebuildLocalisationCache();
                }
-               MessageBlobStore::clear();
+               MessageBlobStore::getInstance()->clear();
                $this->output( "done.\n" );
        }
  
@@@ -984,7 -984,6 +984,7 @@@
  
        /**
         * Updates the timestamps in the transcache table
 +       * @return bool
         */
        protected function doUpdateTranscacheField() {
                if ( $this->updateRowExists( 'convert transcache field' ) ) {