bug fixes

2015-02-09 11:32:39 +02:00
parent 2835928ac0
commit 96d0a7db00
1 changed files with 1 additions and 1 deletions
@@ -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;