Refactor redundant attrib dropping into new method

[lhc/web/wiklou.git] / includes / LocalisationCache.php

diff --git a/includes/LocalisationCache.php b/includes/LocalisationCache.php
index 77fa7cb..ae9007f 100644 (file)
--- a/includes/LocalisationCache.php
+++ b/includes/LocalisationCache.php
@@ -275,7 +275,9 @@ class LocalisationCache {
                        $this->initLanguage( $code );
                }
                // Check to see if initLanguage() loaded it for us
-               if ( isset( $this->loadedSubitems[$code][$key][$subkey] ) ) {
+               if ( isset( $this->loadedItems[$code][$key] )
+                       || isset( $this->loadedSubitems[$code][$key][$subkey] ) )
+               {
                        return;
                }
                if ( isset( $this->shallowFallbacks[$code] ) ) {
@@ -375,9 +377,9 @@ class LocalisationCache {
         */
        protected function readPHPFile( $_fileName, $_fileType ) {
                // Disable APC caching
-               $_apcEnabled = ini_set( 'apc.enabled', '0' );
+               $_apcEnabled = ini_set( 'apc.cache_by_default', '0' );
                include( $_fileName );
-               ini_set( 'apc.enabled', $_apcEnabled );
+               ini_set( 'apc.cache_by_default', $_apcEnabled );
 
                if ( $_fileType == 'core' || $_fileType == 'extension' ) {
                        $data = compact( self::$allKeys );
@@ -510,8 +512,9 @@ class LocalisationCache {
                        $data = $this->readPHPFile( $fileName, 'extension' );
                        $used = false;
                        foreach ( $data as $key => $item ) {
-                               $used = $used |
-                                       $this->mergeExtensionItem( $codeSequence, $key, $allData[$key], $item );
+                               if( $this->mergeExtensionItem( $codeSequence, $key, $allData[$key], $item ) ) {
+                                       $used = true;
+                               }
                        }
                        if ( $used ) {
                                $deps[] = new FileDependency( $fileName );
@@ -668,6 +671,7 @@ class LocalisationCache {
         */
        public function disableBackend() {
                $this->store = new LCStore_Null;
+               $this->manualRecache = false;
        }
 }
 
@@ -723,6 +727,7 @@ class LCStore_DB implements LCStore {
        var $currentLang;
        var $writesDone = false;
        var $dbw, $batch;
+       var $readOnly = false;
 
        public function get( $code, $key ) {
                if ( $this->writesDone ) {
@@ -740,17 +745,34 @@ class LCStore_DB implements LCStore {
        }
 
        public function startWrite( $code ) {
+               if ( $this->readOnly ) {
+                       return;
+               }
                if ( !$code ) {
                        throw new MWException( __METHOD__.": Invalid language \"$code\"" );
                }
                $this->dbw = wfGetDB( DB_MASTER );
-               $this->dbw->begin();
-               $this->dbw->delete( 'l10n_cache', array( 'lc_lang' => $code ), __METHOD__ );
+               try {
+                       $this->dbw->begin();
+                       $this->dbw->delete( 'l10n_cache', array( 'lc_lang' => $code ), __METHOD__ );
+               } catch ( DBQueryError $e ) {
+                       if ( $this->dbw->wasReadOnlyError() ) {
+                               $this->readOnly = true;
+                               $this->dbw->rollback();
+                               $this->dbw->ignoreErrors( false );
+                               return;
+                       } else {
+                               throw $e;
+                       }
+               }
                $this->currentLang = $code;
                $this->batch = array();
        }
 
        public function finishWrite() {
+               if ( $this->readOnly ) {
+                       return;
+               }
                if ( $this->batch ) {
                        $this->dbw->insert( 'l10n_cache', $this->batch, __METHOD__ );
                }
@@ -762,6 +784,9 @@ class LCStore_DB implements LCStore {
        }
 
        public function set( $key, $value ) {
+               if ( $this->readOnly ) {
+                       return;
+               }
                if ( is_null( $this->currentLang ) ) {
                        throw new MWException( __CLASS__.': must call startWrite() before calling set()' );
                }
@@ -827,6 +852,10 @@ class LCStore_CDB implements LCStore {
                                        "directory \"{$this->directory}\"" );
                        }
                }
+               // Close reader to stop permission errors on write
+               if( !empty($this->readers[$code]) ) {
+                       $this->readers[$code]->close();
+               }
                $this->writer = CdbWriter::open( $this->getFileName( $code ) );
                $this->currentLang = $code;
        }
@@ -835,11 +864,6 @@ class LCStore_CDB implements LCStore {
                // Close the writer
                $this->writer->close();
                $this->writer = null;
-
-               // Reopen the reader
-               if ( !empty( $this->readers[$this->currentLang] ) ) {
-                       $this->readers[$this->currentLang]->close();
-               }
                unset( $this->readers[$this->currentLang] );
                $this->currentLang = null;
        }