* Make variant table caching a little more robust, using main language code

  in cache key. Probably this is still a bit wonky, though. Was breaking
  parser tests when Chinese tables were getting loaded into Serbian code.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e5c2178..d1c6177 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -416,6 +416,10 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Prevent conversion of JavaScript code in language variants
 * Output software version number in maintenance/parserTests.php
 * (bug 7169) Use Ajax to watch/unwatch articles if enabled
+* Make variant table caching a little more robust, using main language code
+  in cache key. Probably this is still a bit wonky, though. Was breaking
+  parser tests when Chinese tables were getting loaded into Serbian code.
+
 
 == Languages updated ==
 

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 73b7f48..5f2e2fc 100644 (file)
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -40,7 +40,7 @@ class LanguageConverter {
                $this->mMainLanguageCode = $maincode;
                $this->mVariants = $variants;
                $this->mVariantFallbacks = $variantfallbacks;
-               $this->mCacheKey = wfMemcKey( 'conversiontables' );
+               $this->mCacheKey = wfMemcKey( 'conversiontables', $maincode );
                $m = array('begin'=>'-{', 'flagsep'=>'|', 'codesep'=>':',
                                   'varsep'=>';', 'end'=>'}-');
                $this->mMarkup = array_merge($m, $markup);

diff --git a/languages/classes/LanguageSr.php b/languages/classes/LanguageSr.php
index e3eaf30..2d56aff 100644 (file)
--- a/languages/classes/LanguageSr.php
+++ b/languages/classes/LanguageSr.php
@@ -160,6 +160,9 @@ class SrConverter extends LanguageConverter {
                $matches = preg_split($reg, $text, -1, PREG_SPLIT_OFFSET_CAPTURE);
                
                $m = array_shift($matches);
+               if( !isset( $this->mTables[$toVariant] ) ) {
+                       throw new MWException( "Broken variant table: " . implode( ',', array_keys( $this->mTables ) ) );
+               }
                $ret = $this->mTables[$toVariant]->replace( $m[0] );
                $mstart = $m[1]+strlen($m[0]);
                foreach($matches as $m) {