wrong default charset in case of broken session
This commit is contained in:
@@ -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
|
||||
|
@@ -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';
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user