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

bug #2355753 [core] do not bail out creating session on any PHP warning

Browse Source
This commit is contained in:
Michal Čihař
2008-11-28 13:25:26 +00:00
parent 8bb75dd8eb
commit e7ded36b56
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -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 #2202709 [core] Re-login causes PMA to forget current table name
- bug #2280904 [export] do not include view name in export - bug #2280904 [export] do not include view name in export
- rfe #1688975 [display] enable copying of auto increment by default - 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) 3.1.0.0 (2008-11-28)
+ [auth] Support for Swekey hardware authentication, + [auth] Support for Swekey hardware authentication,

6
libraries/session.inc.php
View File

@@ -20,7 +20,7 @@ if (! defined('PHPMYADMIN')) {
if (!@function_exists('session_name')) { if (!@function_exists('session_name')) {
PMA_fatalError('strCantLoad', 'session'); PMA_fatalError('strCantLoad', 'session');
} elseif (ini_get('session.auto_start') == true && session_name() != 'phpMyAdmin') { } 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. // applications; instead just close it.
session_write_close(); session_write_close();
} }
@@ -71,10 +71,12 @@ if (! isset($_COOKIE[$session_name])) {
// on first start of session we check for errors // on first start of session we check for errors
// f.e. session dir cannot be accessed - session file not created // f.e. session dir cannot be accessed - session file not created
$r = session_start(); $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); setcookie($session_name, '', 1);
PMA_fatalError('strSessionStartupErrorGeneral'); PMA_fatalError('strSessionStartupErrorGeneral');
} }
unset($orig_error_count);
} else { } else {
@session_start(); @session_start();
} }