config variables are always set

This commit is contained in:
Sebastian Mendel
2007-10-24 09:44:07 +00:00
parent 6e39abf02a
commit 67bf403cfb

View File

@@ -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'];
}
}