From 96d0a7db00449fe36cb77b7ce56eb4a65fb2f133 Mon Sep 17 00:00:00 2001 From: Taras Machyshyn Date: Mon, 9 Feb 2015 11:32:39 +0200 Subject: [PATCH] bug fixes --- application/Espo/Core/Utils/Config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/Espo/Core/Utils/Config.php b/application/Espo/Core/Utils/Config.php index 01059829c4..b07b9d3a78 100644 --- a/application/Espo/Core/Utils/Config.php +++ b/application/Espo/Core/Utils/Config.php @@ -262,7 +262,7 @@ class Config } if (empty($this->adminItems)) { - $this->adminItems= Util::merge($data['systemItems'], $data['adminItems']); + $this->adminItems = array_merge($data['systemItems'], $data['adminItems']); } return $this->adminItems;