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

bug #1728590 Detected failing session_start fails

Browse Source
This commit is contained in:
Marc Delisle
2007-06-03 23:30:40 +00:00
parent a72fb8ff2b
commit a554042b5e
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -84,6 +84,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #1718787 Multi-server setup breaks Designer - bug #1718787 Multi-server setup breaks Designer
- bug #1724401 Column truncation in repair table output - bug #1724401 Column truncation in repair table output
- patch #1726500 Wrong position of </tbody>, thanks to Jürgen Wind - patch #1726500 Wrong position of </tbody>, thanks to Jürgen Wind
- bug #1728590 Detected failing session_start fails, thanks to Jürgen Wind
2.10.1.0 (2007-04-23) 2.10.1.0 (2007-04-23)
===================== =====================

2
libraries/core.lib.php
View File

@@ -242,7 +242,7 @@ function PMA_fatalError($error_message, $message_args = null)
// Displays the error message // Displays the error message
// (do not use &amp; for parameters sent by header) // (do not use &amp; for parameters sent by header)
header('Location: error.php' header('Location: ' . (defined('PMA_SETUP') ? '../' : '') . 'error.php'
. '?lang=' . urlencode($GLOBALS['available_languages'][$GLOBALS['lang']][2]) . '?lang=' . urlencode($GLOBALS['available_languages'][$GLOBALS['lang']][2])
. '&dir=' . urlencode($GLOBALS['text_dir']) . '&dir=' . urlencode($GLOBALS['text_dir'])
. '&type=' . urlencode($GLOBALS['strError']) . '&type=' . urlencode($GLOBALS['strError'])

3
libraries/select_lang.lib.php
View File

@@ -414,7 +414,8 @@ 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 {
$GLOBALS['convcharset'] = $GLOBALS['cfg']['DefaultCharset']; // session.save_path might point to a bad folder
$convcharset = isset($GLOBALS['cfg']['DefaultCharset']) ? $GLOBALS['cfg']['DefaultCharset'] : 'en-utf-8';
} }
} }

1
scripts/setup.php
View File

@@ -15,6 +15,7 @@
// Grab phpMyAdmin version and PMA_dl function // Grab phpMyAdmin version and PMA_dl function
define('PMA_MINIMUM_COMMON', TRUE); define('PMA_MINIMUM_COMMON', TRUE);
define('PMA_SETUP', TRUE);
chdir('..'); chdir('..');
require_once './libraries/common.inc.php'; require_once './libraries/common.inc.php';