From e7ded36b563887ddb5dd104a03a96e479e428de3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 28 Nov 2008 13:25:26 +0000
Subject: [PATCH] bug #2355753 [core] do not bail out creating session on any
 PHP warning

---
 ChangeLog                 | 1 +
 libraries/session.inc.php | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 880e45abda..c8a981977b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #2202709 [core] Re-login causes PMA to forget current table name 
 - bug #2280904 [export] do not include view name in export
 - rfe #1688975 [display] enable copying of auto increment by default
+- bug #2355753 [core] do not bail out creating session on any PHP warning
 
 3.1.0.0 (2008-11-28)
 + [auth] Support for Swekey hardware authentication,
diff --git a/libraries/session.inc.php b/libraries/session.inc.php
index f4824b1665..a80c9d4312 100644
--- a/libraries/session.inc.php
+++ b/libraries/session.inc.php
@@ -20,7 +20,7 @@ if (! defined('PHPMYADMIN')) {
 if (!@function_exists('session_name')) {
     PMA_fatalError('strCantLoad', 'session');
 } elseif (ini_get('session.auto_start') == true && session_name() != 'phpMyAdmin') {
-    // Do not delete the existing session, it might be used by other 
+    // Do not delete the existing session, it might be used by other
     // applications; instead just close it.
     session_write_close();
 }
@@ -71,10 +71,12 @@ if (! isset($_COOKIE[$session_name])) {
     // on first start of session we check for errors
     // f.e. session dir cannot be accessed - session file not created
     $r = session_start();
-    if ($r !== true || $GLOBALS['error_handler']->hasErrors()) { 
+    $orig_error_count = $GLOBALS['error_handler']->countErrors();
+    if ($r !== true || $orig_error_count != $GLOBALS['error_handler']->countErrors()) {
         setcookie($session_name, '', 1);
         PMA_fatalError('strSessionStartupErrorGeneral');
     }
+    unset($orig_error_count);
 } else {
     @session_start();
 }
-- 
2.11.4.GIT