From: Philip Tzou <philip@users.mediawiki.org>
Date: Sat, 28 Nov 2009 20:13:46 +0000 (+0000)
Subject: follow-up r59522. "string-contains" added.
X-Git-Tag: 1.31.0-rc.0~38683
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=57e84949a6c17ece991cb8f730e12b4ca6029011;p=lhc%2Fweb%2Fwiklou.git

follow-up r59522. "string-contains" added.
---

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 9344ec58d5..a95ec55ba4 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -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;
 			}