Fix error in array_merge messing up with numeric keys.

pydio · May 9, 2014 · 41a8db6 · 41a8db6
1 parent c6e9f37
commit 41a8db6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git 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;
     }