gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-11 09:35:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

better handling of return values of hooks

Browse Source
This commit is contained in:
Uwe Steinmann 2019-01-17 18:30:10 +01:00
parent 50cf2fa5a0
commit 869a82d4a8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
inc/inc.ClassViewCommon.php
View File

@ -121,10 +121,10 @@ class SeedDMS_View_Common {
break;
}
if($tmpret !== null) {
if(is_string($tmpret))
$ret .= $tmpret;
elseif(is_array($tmpret) || is_object($tmpret)) {
$ret = ($ret === null) ? $tmpret : array_merge($ret, $tmpret);
if(is_string($tmpret)) {
$ret = ($ret === null) ? $tmpret : (is_string($ret) ? $ret.$tmpret : array_merge($ret, array($tmpret)));
} elseif(is_array($tmpret) || is_object($tmpret)) {
$ret = ($ret === null) ? $tmpret : (is_string($ret) ? array_merge(array($ret), $tmpret) : array_merge($ret, $tmpret));
} else
$ret = $tmpret;
}