bug #1728590 Detected failing session_start fails

ChangeLog

@@ -84,6 +84,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #1718787 Multi-server setup breaks Designer
 - bug #1724401 Column truncation in repair table output
 - 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)
 =====================

libraries/core.lib.php

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

libraries/select_lang.lib.php

@@ -414,7 +414,8 @@ if (empty($GLOBALS['convcharset'])) {
     if (isset($_COOKIE['pma_charset'])) {
         $GLOBALS['convcharset'] = $_COOKIE['pma_charset'];
     } 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';
     }
 }
 

scripts/setup.php

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