* Fixed the HTTP accept language string detection length in LanguageConverter.php...

  patch by PhiLiP

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c68068a..a020edc 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -197,6 +197,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 15544) Wiki not set up message (NoLocalSettings.php) now works for 
   non-index.php entry pages (e.g. api.php). Patch by Matt Johnston.
 * (bug 12284) Special:Preferences now sets a returnto parameter on the link to Special:Userlogin. Patch by Marooned.
+* Fixed the HTTP accept language string detection length in 
+  LanguageConverter.php, instead of the fixed length language codes.
 
 
 === API changes in 1.14 ===

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 1c3926c..dd69e82 100644 (file)
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -180,7 +180,8 @@ class LanguageConverter {
                                $header = str_replace( '_', '-', strtolower($_SERVER["HTTP_ACCEPT_LANGUAGE"]));
                                $zh = strstr($header, $pv.'-');
                                if($zh) {
-                                       $pv = substr($zh,0,5);
+                                       $ary = split("[,;]",$zh);
+                                       $pv = $ary[0];
                                }
                        }
                        // don't try to return bad variant