diff --git a/CHANGELOG b/CHANGELOG index 160772eb8..0a85fff03 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 diff --git a/inc/inc.ClassViewCommon.php b/inc/inc.ClassViewCommon.php index 340c6c6a2..482a4e038 100644 --- a/inc/inc.ClassViewCommon.php +++ b/inc/inc.ClassViewCommon.php @@ -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; } diff --git a/views/bootstrap/class.LogManagement.php b/views/bootstrap/class.LogManagement.php index 80da5ff4a..0358f6bd2 100644 --- a/views/bootstrap/class.LogManagement.php +++ b/views/bootstrap/class.LogManagement.php @@ -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);