From 67bf403cfb48c503e8f70724e335dd3602d690c4 Mon Sep 17 00:00:00 2001
From: Sebastian Mendel <cybot_tm@users.sourceforge.net>
Date: Wed, 24 Oct 2007 09:44:07 +0000
Subject: [PATCH] config variables are always set

---
 libraries/select_lang.lib.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index 3c970946d..51d4b0757 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -14,6 +14,7 @@
  * @uses    $GLOBALS['lang_failed_cfg']
  * @uses    $GLOBALS['lang_failed_cookie']
  * @uses    $GLOBALS['lang_failed_request']
+ * @uses    $GLOBALS['convcharset'] to set it if not set
  * @uses    $_REQUEST['lang']
  * @uses    $_COOKIE['pma_lang']
  * @uses    $_SERVER['HTTP_ACCEPT_LANGUAGE']
@@ -343,7 +344,7 @@ if (empty($GLOBALS['convcharset'])) {
         $GLOBALS['convcharset'] = $_COOKIE['pma_charset'];
     } else {
         // session.save_path might point to a bad folder
-        $convcharset = isset($GLOBALS['cfg']['DefaultCharset']) ? $GLOBALS['cfg']['DefaultCharset'] : 'en-utf-8';
+        $GLOBALS['convcharset'] = $GLOBALS['cfg']['DefaultCharset'];
     }
 }