From 1410002c8695ab03dd12656d3cc5adad50cbb0c7 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 2 Nov 2007 16:45:49 +0000
Subject: [PATCH] wrong default charset in case of broken session

---
 ChangeLog                     | 1 +
 libraries/select_lang.lib.php | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bec0b1a43..2cf4e29b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
   Bertrand
 - patch #1821154, HTTP authentication: fix auth working with php/mod_fastcgi,
   thanks to yarodin
+- wrong default charset in case of broken session
 
 2.11.2.0 (2007-10-27)
 - patch #1791576 HTTP auth: support REDIRECT_REMOTE_USER, thanks to Allard
diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index 51d4b0757..bacc9c234 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -343,8 +343,9 @@ if (empty($GLOBALS['convcharset'])) {
     if (isset($_COOKIE['pma_charset'])) {
         $GLOBALS['convcharset'] = $_COOKIE['pma_charset'];
     } else {
-        // session.save_path might point to a bad folder
-        $GLOBALS['convcharset'] = $GLOBALS['cfg']['DefaultCharset'];
+        // session.save_path might point to a bad folder, in which case
+        // $GLOBALS['cfg'] would not exist
+        $GLOBALS['convcharset'] = isset($GLOBALS['cfg']['DefaultCharset']) ? $GLOBALS['cfg']['DefaultCharset'] : 'utf-8';
     }
 }