[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-6486-g26c79f5

[Michal Čihař]

The branch, master has been updated
       via  26c79f55c5de7b95fb9346bb056944b4f1aa65aa (commit)
      from  1f248cc2549a2f5c1a47d209f2062ccb1fa4682c (commit)


- Log -----------------------------------------------------------------
commit 26c79f55c5de7b95fb9346bb056944b4f1aa65aa
Author: Michal Čihař <mcihar at novell.com>
Date:   Thu Aug 19 10:52:58 2010 +0200

    Backward compatibility for language cookies.

-----------------------------------------------------------------------

Summary of changes:
 libraries/select_lang.lib.php |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index 06b35f4..f1a3725 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -121,6 +121,9 @@ function PMA_langCheck()
  */
 function PMA_langSet(&$lang)
 {
+    /* Partial backward compatibility with 3.3 and older branches */
+    $lang = str_replace('-utf-8', '', $lang);
+
     if (!is_string($lang) || empty($lang) || empty($GLOBALS['available_languages'][$lang])) {
         return false;
     }


hooks/post-receive
-- 
phpMyAdmin