gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2026-03-14 15:49:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2026-02-13 08:39:43 +01:00
commit c635b0e1cc
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -371,6 +371,8 @@
--------------------------------------------------------------------------------
Changes in version 5.1.46
--------------------------------------------------------------------------------
- new section 'console' in log management
- arrays returned by view hooks are combined with array_merge() instead of '+'
--------------------------------------------------------------------------------
Changes in version 5.1.45

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

1
views/bootstrap/class.LogManagement.php
View File

@ -110,6 +110,7 @@ $("input[type=checkbox]").each(function () { this.checked = !this.checked; });
array('default', 'Web'),
array('webdav', 'WebDAV'),
array('restapi', 'RestAPI'),
array('console', 'Console'),
);
if($es = $this->callHook('extraSections'))
$sections = array_merge($sections, $es);