From 41a8db6b14b9e2bdd4707e2ccc41f63bd6a83946 Mon Sep 17 00:00:00 2001 From: cdujeu Date: Fri, 9 May 2014 18:38:52 +0200 Subject: [PATCH] Fix error in array_merge messing up with numeric keys. --- core/src/core/classes/class.ConfService.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/core/classes/class.ConfService.php b/core/src/core/classes/class.ConfService.php index 7c2bbdf496..a6a0a38193 100644 --- a/core/src/core/classes/class.ConfService.php +++ b/core/src/core/classes/class.ConfService.php @@ -560,7 +560,7 @@ protected function initRepositoriesListInst($scope = "user") continue; } $repo->setWriteable(false); - $objList[$repo->getId()] = $repo; + $objList["".$repo->getId()] = $repo; } // LOAD FROM DRIVER $confDriver = self::getConfStorageImpl(); @@ -590,7 +590,9 @@ protected function initRepositoriesListInst($scope = "user") $drvList[$repoId] = $repoObject; } } - $objList = array_merge($objList, $drvList); + foreach($drvList as $key => $value){ + $objList[$key] = $value; + } } return $objList; }