From: Philip Tzou <philip@users.mediawiki.org>
Date: Sun, 29 Nov 2009 18:38:57 +0000 (+0000)
Subject: follow-up r59544. more comments added.
X-Git-Tag: 1.31.0-rc.0~38672
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=080f144fc45dea21e45fb0a508bac8b1e25ca19d;p=lhc%2Fweb%2Fwiklou.git

follow-up r59544. more comments added.
---

diff --git a/includes/Wiki.php b/includes/Wiki.php
index c2dfb5f6ce..e3924a1cdd 100644
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -225,6 +225,8 @@ class MediaWiki {
 		// Redirect loops, no title in URL, $wgUsePathInfo URLs
 		} else if( $action == 'view' && !$request->wasPosted() &&
 			( ( !isset($this->GET['title']) || $title->getPrefixedDBKey() != $this->GET['title'] ) ||
+			  // No valid variant in URL (if the main-language has multi-variants), to ensure
+			  // the Accept-Language would only be added to XVO when a 301 redirection happened
 			  ( !isset($this->GET['variant']) && $perferred != $wgContLang->getCode() &&
 			    $wgContLang->hasVariants() && !$wgUser->isLoggedIn() ) ) &&
 			!count( array_diff( array_keys( $this->GET ), array( 'action', 'title' ) ) ) )