Merge branch 'master' into permissions

2026-06-16 03:29:34 +00:00 · 2018-06-26 14:02:54 +02:00
parent bd101e154c 22a8e91e15
commit 737c9fa07e
3 changed files with 8 additions and 8 deletions
@@ -234,7 +234,7 @@ class NavigationLib
 						if (isset($config[$configName]) && is_array($config[$configName]))
 						{
 							$extensionArray = array_merge_recursive(
-								$json_extension,
+								$extensionArray,
 								$this->_wildcardsearch($config[$configName],
 								$navigationPage)
 							);