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

patch #2520747 [core] E_DEPRECATED compatibility for PHP 5.3

Browse Source
This commit is contained in:
Marc Delisle
2009-01-20 18:04:20 +00:00
parent 8fe7c8c2e7
commit 46eb6a9de0
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -10,6 +10,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- patch #2496403 [display] Multi-row change with "]", - patch #2496403 [display] Multi-row change with "]",
thanks to Virsacer - virsacer thanks to Virsacer - virsacer
- bug #2027720 [parser] Missing space after BINARY used as cast - bug #2027720 [parser] Missing space after BINARY used as cast
- patch #2520747 [core] E_DEPRECATED compatibility for PHP 5.3,
thanks to Giovanni Giacobbi - themnemonic
3.1.2.0 (2009-01-19) 3.1.2.0 (2009-01-19)
- bug #1253252 [display] Can't NULL a column with relation defined - bug #1253252 [display] Can't NULL a column with relation defined

6
libraries/Error.class.php
View File

@@ -35,6 +35,7 @@ class PMA_Error extends PMA_Message
E_USER_WARNING => 'User Warning', E_USER_WARNING => 'User Warning',
E_USER_NOTICE => 'User Notice', E_USER_NOTICE => 'User Notice',
E_STRICT => 'Runtime Notice', E_STRICT => 'Runtime Notice',
E_DEPRECATED => 'Deprecation Notice',
E_RECOVERABLE_ERROR => 'Catchable Fatal Error', E_RECOVERABLE_ERROR => 'Catchable Fatal Error',
); );
@@ -56,6 +57,7 @@ class PMA_Error extends PMA_Message
E_USER_WARNING => 'warning', E_USER_WARNING => 'warning',
E_USER_NOTICE => 'notice', E_USER_NOTICE => 'notice',
E_STRICT => 'notice', E_STRICT => 'notice',
E_DEPRECATED => 'notice',
E_RECOVERABLE_ERROR => 'error', E_RECOVERABLE_ERROR => 'error',
); );
@@ -299,14 +301,14 @@ class PMA_Error extends PMA_Message
echo $step['class'] . $step['type']; echo $step['class'] . $step['type'];
} }
echo $step['function'] . '('; echo $step['function'] . '(';
if (count($step['args']) > 1) { if (isset($step['args']) && (count($step['args']) > 1)) {
echo "<br />\n"; echo "<br />\n";
foreach ($step['args'] as $arg) { foreach ($step['args'] as $arg) {
echo "\t"; echo "\t";
$this->displayArg($arg, $step['function']); $this->displayArg($arg, $step['function']);
echo ',' . "<br />\n"; echo ',' . "<br />\n";
} }
} elseif (count($step['args']) > 0) { } elseif (isset($step['args']) && (count($step['args']) > 0)) {
foreach ($step['args'] as $arg) { foreach ($step['args'] as $arg) {
$this->displayArg($arg, $step['function']); $this->displayArg($arg, $step['function']);
} }

1
libraries/Error_Handler.class.php
View File

@@ -122,6 +122,7 @@ class PMA_Error_Handler
case E_USER_NOTICE: case E_USER_NOTICE:
case E_USER_WARNING: case E_USER_WARNING:
case E_STRICT: case E_STRICT:
case E_DEPRECATED:
case E_NOTICE: case E_NOTICE:
case E_WARNING: case E_WARNING:
case E_CORE_WARNING: case E_CORE_WARNING:

7
libraries/common.inc.php
View File

@@ -39,6 +39,13 @@ if (version_compare(PHP_VERSION, '5.2.0', 'lt')) {
die('PHP 5.2+ is required'); die('PHP 5.2+ is required');
} }
/**
* Backward compatibility for PHP 5.2
*/
if (!defined('E_DEPRECATED')) {
define('E_DEPRECATED', 8192);
}
/** /**
* the error handler * the error handler
*/ */