cellog Mon Aug 22 18:09:06 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/pear/PEAR ErrorStack.php
Log:
sync with PEAR 1.3.6
http://cvs.php.net/diff.php/php-src/pear/PEAR/ErrorStack.php?r1=1.8&r2=1.8.2.1&ty=u
Index: php-src/pear/PEAR/ErrorStack.php
diff -u php-src/pear/PEAR/ErrorStack.php:1.8
php-src/pear/PEAR/ErrorStack.php:1.8.2.1
--- php-src/pear/PEAR/ErrorStack.php:1.8 Mon Mar 28 11:38:58 2005
+++ php-src/pear/PEAR/ErrorStack.php Mon Aug 22 18:09:06 2005
@@ -17,7 +17,7 @@
// | |
// +----------------------------------------------------------------------+
//
-// $Id: ErrorStack.php,v 1.8 2005/03/28 16:38:58 cellog Exp $
+// $Id: ErrorStack.php,v 1.8.2.1 2005/08/22 22:09:06 cellog Exp $
/**
* Error Stack Implementation
@@ -538,6 +538,10 @@
'message' => $msg,
);
+ if ($repackage) {
+ $err['repackage'] = $repackage;
+ }
+
// set up the error message, if necessary
if ($this->_msgCallback) {
$msg = call_user_func_array($this->_msgCallback,
@@ -545,9 +549,6 @@
$err['message'] = $msg;
}
- if ($repackage) {
- $err['repackage'] = $repackage;
- }
$push = $log = true;
$die = false;
// try the overriding callback first
@@ -909,8 +910,10 @@
} else {
$mainmsg = $stack->getErrorMessageTemplate($err['code']);
}
+
$mainmsg = str_replace('%__msg%', $err['message'], $mainmsg);
- if (count($err['params'])) {
+
+ if (count($err['params']) && count($err['params'])) {
foreach ($err['params'] as $name => $val) {
if (is_array($val)) {
// @ is needed in case $val is a multi-dimensional array
@@ -978,4 +981,4 @@
}
$stack = &PEAR_ErrorStack::singleton('PEAR_ErrorStack');
$stack->pushCallback(array('PEAR_ErrorStack', '_handleError'));
-?>
\ No newline at end of file
+?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
