summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas V.V.Cox <cox@php.net>2001-08-31 17:56:44 +0000
committerTomas V.V.Cox <cox@php.net>2001-08-31 17:56:44 +0000
commitbf0ab08fb828cfc74746767c6a9eaf3d4e83ea51 (patch)
tree68e528c83011eec9332688e815d54a604eff3251
parent409b87d41e8661507f00c98322e86c9f7092c373 (diff)
downloadphp-git-bf0ab08fb828cfc74746767c6a9eaf3d4e83ea51.tar.gz
fix problem when mixing different error modes under certain circumstances
(pear/test/pear_error3.phpt)
-rw-r--r--pear/PEAR.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/pear/PEAR.php b/pear/PEAR.php
index 8ca8b81a72..c303374634 100644
--- a/pear/PEAR.php
+++ b/pear/PEAR.php
@@ -397,8 +397,10 @@ class PEAR
}
} else {
if ($options === null) {
- if (isset($this) && isset($this->_default_error_options)) {
- $options = $this->_default_error_options;
+ if (isset($this)) {
+ if (isset($this->_default_error_options)) {
+ $options = $this->_default_error_options;
+ }
} else {
$options = $GLOBALS['_PEAR_default_error_options'];
}