nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

config variables are always set

Browse Source
This commit is contained in:
Sebastian Mendel
2007-10-24 09:44:07 +00:00
parent 6e39abf02a
commit 67bf403cfb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/select_lang.lib.php
View File

@@ -14,6 +14,7 @@
* @uses $GLOBALS['lang_failed_cfg'] * @uses $GLOBALS['lang_failed_cfg']
* @uses $GLOBALS['lang_failed_cookie'] * @uses $GLOBALS['lang_failed_cookie']
* @uses $GLOBALS['lang_failed_request'] * @uses $GLOBALS['lang_failed_request']
* @uses $GLOBALS['convcharset'] to set it if not set
* @uses $_REQUEST['lang'] * @uses $_REQUEST['lang']
* @uses $_COOKIE['pma_lang'] * @uses $_COOKIE['pma_lang']
* @uses $_SERVER['HTTP_ACCEPT_LANGUAGE'] * @uses $_SERVER['HTTP_ACCEPT_LANGUAGE']
@@ -343,7 +344,7 @@ if (empty($GLOBALS['convcharset'])) {
$GLOBALS['convcharset'] = $_COOKIE['pma_charset']; $GLOBALS['convcharset'] = $_COOKIE['pma_charset'];
} else { } else {
// session.save_path might point to a bad folder // 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'];
} }
} }