summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pear/PEAR.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/pear/PEAR.php b/pear/PEAR.php
index 2f3d71b8dd..8b29290cb9 100644
--- a/pear/PEAR.php
+++ b/pear/PEAR.php
@@ -26,6 +26,8 @@ define('PEAR_ERROR_PRINT', 2);
define('PEAR_ERROR_TRIGGER', 4);
define('PEAR_ERROR_DIE', 8);
define('PEAR_ERROR_CALLBACK', 16);
+define('PEAR_ZE2', (function_exists('version_compare') &&
+ version_compare(zend_version(), "2-dev", "ge")));
if (substr(PHP_OS, 0, 3) == 'WIN') {
define('OS_WINDOWS', true);
@@ -348,7 +350,7 @@ class PEAR
}
// }}}
- // {{{ _checkDelExpect()
+ // {{{ _checkDelExpect()
/**
* This method checks unsets an error code if available
@@ -867,9 +869,6 @@ class PEAR_Error
$callback, $this->error_message_prefix,
$this->userinfo);
}
- if ($this->mode & PEAR_ERROR_CALLBACK) {
- $modes[] = 'callback';
- }
if ($this->mode & PEAR_ERROR_PRINT) {
$modes[] = 'print';
}