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

replace array_merge by '+' when combining returned array of hooks

Browse Source
This commit is contained in:
Uwe Steinmann 2025-06-25 12:58:37 +02:00
parent a74f5d9668
commit ac29815974
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/inc.ClassControllerCommon.php
View File

@ -285,7 +285,7 @@ class SeedDMS_Controller_Common {
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));
$ret = ($ret === null) ? $tmpret : (is_string($ret) ? (array($ret) + $tmpret) : ($ret + $tmpret));
} else
$ret = $tmpret;
}

2
inc/inc.ClassViewCommon.php
View File

@ -213,7 +213,7 @@ class SeedDMS_View_Common {
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));
$ret = ($ret === null) ? $tmpret : (is_string($ret) ? (array($ret) + $tmpret) : ($ret + $tmpret));
} else
$ret = $tmpret;
}