From: Tim Starling <tstarling@users.mediawiki.org>
Date: Mon, 16 Oct 2006 02:36:28 +0000 (+0000)
Subject: fix FSS-related bug
X-Git-Tag: 1.31.0-rc.0~55472
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=3d249cc9a737a965fccabc816afdb192f1c0ee0f;p=lhc%2Fweb%2Fwiklou.git

fix FSS-related bug
---

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index a39f9caa96..6cb1ad950a 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -544,26 +544,27 @@ class LanguageConverter {
 		if( $this->mTablesLoaded )
 			return;
 		$this->mTablesLoaded = true;
+		$this->mTables = false;
 		if($fromcache) {
 			$this->mTables = $wgMemc->get( $this->mCacheKey );
-			if( !empty( $this->mTables ) ) //all done
-				return;
-		}
-		// not in cache, or we need a fresh reload.
-		// we will first load the default tables
-		// then update them using things in MediaWiki:Zhconversiontable/*
-		global $wgMessageCache;
-		$this->loadDefaultTables();
-		foreach($this->mVariants as $var) {
-			$cached = $this->parseCachedTable($var);
-			$this->mTables[$var] = array_merge($this->mTables[$var], $cached);
 		}
+		if ( !$this->mTables ) {
+			// not in cache, or we need a fresh reload.
+			// we will first load the default tables
+			// then update them using things in MediaWiki:Zhconversiontable/*
+			global $wgMessageCache;
+			$this->loadDefaultTables();
+			foreach($this->mVariants as $var) {
+				$cached = $this->parseCachedTable($var);
+				$this->mTables[$var] = array_merge($this->mTables[$var], $cached);
+			}
 
-		$this->postLoadTables();
+			$this->postLoadTables();
 
-		if($this->lockCache()) {
-			$wgMemc->set($this->mCacheKey, $this->mTables, 43200);
-			$this->unlockCache();
+			if($this->lockCache()) {
+				$wgMemc->set($this->mCacheKey, $this->mTables, 43200);
+				$this->unlockCache();
+			}
 		}
 		if ( $this->mUseFss ) {
 			$this->generateFssObjects();