php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-14 19:41:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

* enable static use of PEAR::raiseError

Browse Source
This commit is contained in:
Stig Bakken
2001-04-17 01:29:48 +00:00
parent 457333c1fd
commit 266cc59f06
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pear/PEAR.php.in
View File

@@ -260,10 +260,11 @@ class PEAR
*/
function &raiseError($message = null, $code = null, $mode = null,
$options = null, $userinfo = null)
$options = null, $userinfo = null,
$error_class = null)
{
if ($mode === null) {
if (isset($this->_default_error_mode)) {
if (isset($this) && isset($this->_default_error_mode)) {
$mode = $this->_default_error_mode;
} else {
$mode = $GLOBALS['_PEAR_default_error_mode'];
@@ -271,7 +272,7 @@ class PEAR
}
if ($mode == PEAR_ERROR_TRIGGER && $options === null) {
if (isset($this->_default_error_options)) {
if (isset($this) && isset($this->_default_error_options)) {
$options = $this->_default_error_options;
} else {
$options = $GLOBALS['_PEAR_default_error_options'];
@@ -282,7 +283,7 @@ class PEAR
if (!is_string($options) &&
!(is_array($options) && sizeof($options) == 2 &&
is_object($options[0]) && is_string($options[1]))) {
if (isset($this->_default_error_callback)) {
if (isset($this) && isset($this->_default_error_callback)) {
$options = $this->_default_error_callback;
} else {
$options = $GLOBALS['_PEAR_default_error_callback'];
@@ -290,14 +291,20 @@ class PEAR
}
} else {
if ($options === null) {
if (isset($this->_default_error_options)) {
if (isset($this) && isset($this->_default_error_options)) {
$options = $this->_default_error_options;
} else {
$options = $GLOBALS['_PEAR_default_error_options'];
}
}
}
$ec = $this->_error_class;
if ($error_class !== null) {
$ec = $error_class;
} elseif (isset($this)) {
$ec = $this->_error_class;
} else {
$ec = 'PEAR_Error';
}
return new $ec($message, $code, $mode, $options, $userinfo);
}