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

wrong default charset in case of broken session

Browse Source
This commit is contained in:
Marc Delisle
2007-11-02 16:45:49 +00:00
parent 09406e9946
commit 1410002c86
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -19,6 +19,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
Bertrand Bertrand
- patch #1821154, HTTP authentication: fix auth working with php/mod_fastcgi, - patch #1821154, HTTP authentication: fix auth working with php/mod_fastcgi,
thanks to yarodin thanks to yarodin
- wrong default charset in case of broken session
2.11.2.0 (2007-10-27) 2.11.2.0 (2007-10-27)
- patch #1791576 HTTP auth: support REDIRECT_REMOTE_USER, thanks to Allard - patch #1791576 HTTP auth: support REDIRECT_REMOTE_USER, thanks to Allard

5
libraries/select_lang.lib.php
View File

@@ -343,8 +343,9 @@ if (empty($GLOBALS['convcharset'])) {
if (isset($_COOKIE['pma_charset'])) { if (isset($_COOKIE['pma_charset'])) {
$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, in which case
$GLOBALS['convcharset'] = $GLOBALS['cfg']['DefaultCharset']; // $GLOBALS['cfg'] would not exist
$GLOBALS['convcharset'] = isset($GLOBALS['cfg']['DefaultCharset']) ? $GLOBALS['cfg']['DefaultCharset'] : 'utf-8';
} }
} }