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

fix bug 1242 - notice if multi-dimensional array is passed as a parameter

Browse source 
add optional parameter to staticHasErrors() that allows error determination for a single package
This commit is contained in:
Greg Beaver 2004-04-27 04:31:39 +00:00
parent e744a448ab
commit 1f22d848e9
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
pear/PEAR/ErrorStack.php
View file

@ -664,12 +664,22 @@ class PEAR_ErrorStack {
}
/**
* Determine whether there are any errors on any error stack
* Determine whether there are any errors on a single error stack, or on any error stack
*
* The optional parameter can be used to test the existence of any errors without the need of
* singleton instantiation
* @param string|false Package name to check for errors
* @return boolean
* @static
*/
function staticHasErrors()
function staticHasErrors($package = false)
{
if ($package) {
if (!isset($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package])) {
return false;
}
return $GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package]->hasErrors();
}
foreach ($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'] as $package => $obj) {
if ($obj->hasErrors()) {
return true;
@ -824,7 +834,8 @@ class PEAR_ErrorStack {
if (count($err['params'])) {
foreach ($err['params'] as $name => $val) {
if (is_array($val)) {
$val = implode(', ', $val);
// @ is needed in case $val is a multi-dimensional array
$val = @implode(', ', $val);
}
if (is_object($val)) {
if (method_exists($val, '__toString')) {
@ -836,7 +847,7 @@ class PEAR_ErrorStack {
$val = 'Object';
}
}
$mainmsg = str_replace('%' . $name . '%', $val, $mainmsg);
$mainmsg = str_replace('%' . $name . '%', $val, $mainmsg);
}
}
return $mainmsg;