archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Cleaner (and probably safer) condition handling.

Browse source
This commit is contained in:
Jon Parise 2001-04-03 03:12:49 +00:00
parent b2f09a03a2
commit c20a6ff9dc
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pear/PEAR.php.in
View file

@ -236,8 +236,7 @@ class PEAR
if ($mode === null) { if ($mode === null) {
if (isset($this->_default_error_mode)) { if (isset($this->_default_error_mode)) {
$mode = $this->_default_error_mode; $mode = $this->_default_error_mode;
} } else {
if ($mode === null) {
$mode = $GLOBALS['_PEAR_default_error_mode']; $mode = $GLOBALS['_PEAR_default_error_mode'];
} }
} }
@ -245,8 +244,7 @@ class PEAR
if ($mode == PEAR_ERROR_TRIGGER && $options === null) { if ($mode == PEAR_ERROR_TRIGGER && $options === null) {
if (isset($this->_default_error_options)) { if (isset($this->_default_error_options)) {
$options = $this->_default_error_options; $options = $this->_default_error_options;
} } else {
if ($options === null) {
$options = $GLOBALS['_PEAR_default_error_options']; $options = $GLOBALS['_PEAR_default_error_options'];
} }
} }
@ -257,8 +255,7 @@ class PEAR
is_object($options[0]) && is_string($options[1]))) { is_object($options[0]) && is_string($options[1]))) {
if (isset($this->_default_error_callback)) { if (isset($this->_default_error_callback)) {
$options = $this->_default_error_callback; $options = $this->_default_error_callback;
} } else {
if ($options === null) {
$options = $GLOBALS['_PEAR_default_error_callback']; $options = $GLOBALS['_PEAR_default_error_callback'];
} }
} }