cvs: php4 /pear PEAR.php.in
| From: | Jon Parise | Date: | Tue, 03 Apr 2001 03:12:49 +0000 |
| Subject: | cvs: php4 /pear PEAR.php.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-4955@lists.php.net to get a copy of this message | ||
jon Mon Apr 2 20:12:49 2001 EDT
Modified files:
/php4/pear PEAR.php.in
Log:
Cleaner (and probably safer) condition handling.
Index: php4/pear/PEAR.php.in
diff -u php4/pear/PEAR.php.in:1.17 php4/pear/PEAR.php.in:1.18
--- php4/pear/PEAR.php.in:1.17 Thu Mar 29 11:54:27 2001
+++ php4/pear/PEAR.php.in Mon Apr 2 20:12:49 2001
@@ -17,7 +17,7 @@
// | Stig Bakken <ssb@fast.no> |
// +----------------------------------------------------------------------+
//
-// $Id: PEAR.php.in,v 1.17 2001/03/29 19:54:27 chagenbu Exp $
+// $Id: PEAR.php.in,v 1.18 2001/04/03 03:12:49 jon Exp $
//
define('PEAR_ERROR_RETURN', 1);
@@ -236,8 +236,7 @@
if ($mode === null) {
if (isset($this->_default_error_mode)) {
$mode = $this->_default_error_mode;
- }
- if ($mode === null) {
+ } else {
$mode = $GLOBALS['_PEAR_default_error_mode'];
}
}
@@ -245,8 +244,7 @@
if ($mode == PEAR_ERROR_TRIGGER && $options === null) {
if (isset($this->_default_error_options)) {
$options = $this->_default_error_options;
- }
- if ($options === null) {
+ } else {
$options = $GLOBALS['_PEAR_default_error_options'];
}
}
@@ -257,8 +255,7 @@
is_object($options[0]) && is_string($options[1]))) {
if (isset($this->_default_error_callback)) {
$options = $this->_default_error_callback;
- }
- if ($options === null) {
+ } else {
$options = $GLOBALS['_PEAR_default_error_callback'];
}
}