Merge remote-tracking branch 'origin/develop' into develop

Author: cdujeu

core/src/core/src/pydio/Core/Services/RepositoryService.php

@@ -236,7 +236,7 @@ public static function listRepositoriesWithCriteria($criteria, &$count)
         $statics = self::filterRepositoryListWithCriteria($statics, $criteria);
         $dyna = ConfService::getConfStorageImpl()->listRepositoriesWithCriteria($criteria, $count);
         $count += count($statics);
-        return array_merge($statics, $dyna);
+        return $statics + $dyna;
 
     }
 

core/src/plugins/metastore.serial/SerialMetaStore.php

@@ -319,16 +319,19 @@ protected function saveMetaFileData($ajxpNode, $scope, $userId)
             }
             $writeMode = "w";
             $nodeIsWinLocal = false;
-            if($scope === AJXP_METADATA_SCOPE_GLOBAL && $this->nodeIsLocalWindowsFS($ajxpNode) && file_exists($metaFile)){
+            if($scope === AJXP_METADATA_SCOPE_GLOBAL && $this->nodeIsLocalWindowsFS($ajxpNode)) { 
                 $nodeIsWinLocal = true;
-                $writeMode = "rw+";
+                if (file_exists($metaFile)) {
+                    $writeMode = "rw+";
+                    $nodeIsWinLocal = false;
+                }
             }
             $fp = @fopen($metaFile, $writeMode);
             if ($fp !== false) {
                 @fwrite($fp, serialize(self::$fullMetaCache[$metaFile]), strlen(serialize(self::$fullMetaCache[$metaFile])));
                 @fclose($fp);
                 if($nodeIsWinLocal){
-                    $real_path_metafile = TextEncoder::toStorageEncoding(realpath(MetaStreamWrapper::getRealFSReference($metaFile)));
+                    $real_path_metafile = realpath(MetaStreamWrapper::getRealFSReference($metaFile));
                     if (is_dir(dirname($real_path_metafile))) {
                         StatHelper::winSetHidden($real_path_metafile);
                     }