tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3358 from Icinga/bugfix/getconfidentialtraceasstring-index-args 

IcingaException::getConfidentialTraceAsString(): respect functions which don't take args "by definition"
This commit is contained in:
lippserd 2018-02-21 09:18:49 +01:00 committed by GitHub
parent 85f010126c 2355224b05
commit 2f2bde28fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/Icinga/Exception/IcingaException.php
View File

@ -88,13 +88,15 @@ class IcingaException extends Exception
$trace[] = "{$frame['function']}(";
$args = array();
foreach ($frame['args'] as $arg) {
$type = gettype($arg);
$args[] = $type === 'object' ? 'Object(' . get_class($arg) . ')' : ucfirst($type);
}
if (isset($frame['args'])) {
$args = array();
foreach ($frame['args'] as $arg) {
$type = gettype($arg);
$args[] = $type === 'object' ? 'Object(' . get_class($arg) . ')' : ucfirst($type);
}
$trace[] = implode(', ', $args);
$trace[] = implode(', ', $args);
}
$trace[] = ")\n";
}