follow-up r59522. "string-contains" added.
authorPhilip Tzou <philip@users.mediawiki.org>
Sat, 28 Nov 2009 20:13:46 +0000 (20:13 +0000)
committerPhilip Tzou <philip@users.mediawiki.org>
Sat, 28 Nov 2009 20:13:46 +0000 (20:13 +0000)
languages/LanguageConverter.php

index 9344ec5..a95ec55 100644 (file)
@@ -242,9 +242,15 @@ class LanguageConverter {
                                if( $ret_language !== $this->mMainLanguageCode ) {
                                        global $wgOut, $wgUseXVO;
                                        $wgOut->addVaryHeader( 'Accept-Language' );
-                                       if( $wgUseXVO )
-                                               $wgOut->addXVOHeader( 'Accept-Language' );
-                                       
+                                       if( $wgUseXVO ) {
+                                               $aloption = array();
+                                               foreach( $this->mVariants as $variant ) {
+                                                       if($variant === $this->mMainLanguageCode)
+                                                               continue;
+                                                       $aloption[] = 'string-contains=' . $variant;
+                                               }
+                                               $wgOut->addXVOHeader( 'Accept-Language', $aloption );
+                                       }
                                }
                                return $ret_language;
                        }