diff --git a/inc/inc.ClassControllerCommon.php b/inc/inc.ClassControllerCommon.php index f53946b02..51336d399 100644 --- a/inc/inc.ClassControllerCommon.php +++ b/inc/inc.ClassControllerCommon.php @@ -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; } diff --git a/inc/inc.ClassViewCommon.php b/inc/inc.ClassViewCommon.php index 737ac8c00..340c6c6a2 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_merge(array($ret), $tmpret) : array_merge($ret, $tmpret)); + $ret = ($ret === null) ? $tmpret : (is_string($ret) ? (array($ret) + $tmpret) : ($ret + $tmpret)); } else $ret = $tmpret; } diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 9dd44702a..93fe06450 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -351,7 +351,6 @@ class SeedDMS_View_Settings extends SeedDMS_Theme_Style { $order = empty($conf['order']) ? '' : $conf['order']; if(!empty($conf['options'])) { $selections = empty($settings->_extensions[$extname][$confkey]) ? array() : explode(",", $settings->_extensions[$extname][$confkey]); - echo ""; if($allowempty) echo ""; foreach($options as $key=>$opt) {