wrong default charset in case of broken session
This commit is contained in:
@@ -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