Fixes for r60599:

[lhc/web/wiklou.git] / languages / classes / LanguageZh.php

diff --git a/languages/classes/LanguageZh.php b/languages/classes/LanguageZh.php
index 0082424..6a004a0 100644 (file)
--- a/languages/classes/LanguageZh.php
+++ b/languages/classes/LanguageZh.php
@@ -11,7 +11,6 @@ class ZhConverter extends LanguageConverter {
        function __construct($langobj, $maincode,
                                                                $variants=array(),
                                                                $variantfallbacks=array(),
-                                                               $markup=array(),
                                                                $flags = array(),
                                                                $manualLevel = array() ) {
                $this->mDescCodeSep = '：';
@@ -19,7 +18,6 @@ class ZhConverter extends LanguageConverter {
                parent::__construct($langobj, $maincode,
                                                                        $variants,
                                                                        $variantfallbacks,
-                                                                       $markup,
                                                                        $flags,
                                                                        $manualLevel);
                $names = array(
@@ -132,16 +130,7 @@ class LanguageZh extends LanguageZh_hans {
                global $wgHooks;
                parent::__construct();
 
-               $variants_all = array('zh','zh-hans','zh-hant','zh-cn','zh-hk','zh-mo','zh-my','zh-sg','zh-tw');
-               $variants = array();
-               
-               // If a wiki disabled some variants,
-               // LanguageConverter shouldn't process them
-               foreach( $variants_all as $variant ) {
-                       $status = wfMsgExt( "variantname-$variant", array( 'parsemag', 'language' => $this ) );
-                       if( trim($status) != 'disable' )
-                               $variants[] = $variant;
-               }
+               $variants = array('zh','zh-hans','zh-hant','zh-cn','zh-hk','zh-mo','zh-my','zh-sg','zh-tw');
                
                $variantfallbacks = array(
                        'zh'      => array('zh-hans','zh-hant','zh-cn','zh-tw','zh-hk','zh-sg','zh-mo','zh-my'),
@@ -162,7 +151,7 @@ class LanguageZh extends LanguageZh_hans {
 
                $this->mConverter = new ZhConverter( $this, 'zh',
                                                                $variants, $variantfallbacks,
-                                                               array(),array(),
+                                                               array(),
                                                                $ml);
 
                $wgHooks['ArticleSaveComplete'][] = $this->mConverter;
@@ -182,23 +171,24 @@ class LanguageZh extends LanguageZh_hans {
        }
 
        // word segmentation
-       function stripForSearch( $string ) {
+       function stripForSearch( $string, $doStrip = true, $autoVariant = 'zh-hans' ) {
                wfProfileIn( __METHOD__ );
 
-        //always convert to zh-hans before indexing. it should be
-               //better to use zh-hans for search, since conversion from
-               //Traditional to Simplified is less ambiguous than the
-               //other way around
-
-               $t = $this->mConverter->autoConvert( $string, 'zh-hans' );
-               $t = parent::stripForSearch( $t );
+               // always convert to zh-hans before indexing. it should be
+               // better to use zh-hans for search, since conversion from
+               // Traditional to Simplified is less ambiguous than the
+               // other way around
+               $s = $this->mConverter->autoConvert( $string, $autoVariant );
+               // LanguageZh_hans::stripForSearch
+               $s = parent::stripForSearch( $s, $doStrip );
                wfProfileOut( __METHOD__ );
-               return $t;
+               return $s;
 
        }
 
        function convertForSearchResult( $termsArray ) {
                $terms = implode( '|', $termsArray );
+               $terms = self::convertDoubleWidth( $terms );
                $terms = implode( '|', $this->mConverter->autoConvertToAllVariants( $terms ) );
                $ret = array_unique( explode('|', $terms) );
                return $ret;