Permalink
Browse files

patch #2520747 [core] E_DEPRECATED compatibility for PHP 5.3

  • Loading branch information...
lem9 committed Jan 20, 2009
1 parent 8fe7c8c commit 46eb6a9de068efbc2bb2319f04f6300d64ec0b69
Showing with 14 additions and 2 deletions.
  1. +2 −0 ChangeLog
  2. +4 −2 libraries/Error.class.php
  3. +1 −0 libraries/Error_Handler.class.php
  4. +7 −0 libraries/common.inc.php
View
@@ -10,6 +10,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- patch #2496403 [display] Multi-row change with "]",
thanks to Virsacer - virsacer
- 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)
- bug #1253252 [display] Can't NULL a column with relation defined
@@ -35,6 +35,7 @@ class PMA_Error extends PMA_Message
E_USER_WARNING => 'User Warning',
E_USER_NOTICE => 'User Notice',
E_STRICT => 'Runtime Notice',
E_DEPRECATED => 'Deprecation Notice',
E_RECOVERABLE_ERROR => 'Catchable Fatal Error',
);
@@ -56,6 +57,7 @@ class PMA_Error extends PMA_Message
E_USER_WARNING => 'warning',
E_USER_NOTICE => 'notice',
E_STRICT => 'notice',
E_DEPRECATED => 'notice',
E_RECOVERABLE_ERROR => 'error',
);
@@ -299,14 +301,14 @@ public function displayBacktrace()
echo $step['class'] . $step['type'];
}
echo $step['function'] . '(';
if (count($step['args']) > 1) {
if (isset($step['args']) && (count($step['args']) > 1)) {
echo "<br />\n";
foreach ($step['args'] as $arg) {
echo "\t";
$this->displayArg($arg, $step['function']);
echo ',' . "<br />\n";
}
} elseif (count($step['args']) > 0) {
} elseif (isset($step['args']) && (count($step['args']) > 0)) {
foreach ($step['args'] as $arg) {
$this->displayArg($arg, $step['function']);
}
@@ -122,6 +122,7 @@ public function handleError($errno, $errstr, $errfile, $errline, $errcontext)
case E_USER_NOTICE:
case E_USER_WARNING:
case E_STRICT:
case E_DEPRECATED:
case E_NOTICE:
case E_WARNING:
case E_CORE_WARNING:
View
@@ -39,6 +39,13 @@
die('PHP 5.2+ is required');
}
/**
* Backward compatibility for PHP 5.2
*/
if (!defined('E_DEPRECATED')) {
define('E_DEPRECATED', 8192);
}
/**
* the error handler
*/

0 comments on commit 46eb6a9

Please sign in to comment.