Construct path to the version file from the current directory and filename. Fixes...

diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php
index ca50c85c88db33daec2121a05e71e4952c7b546c..638a1916f6ab8226209ef225d24505f560b649a6 100644 (file)
--- a/apps/files_versions/lib/Storage.php
+++ b/apps/files_versions/lib/Storage.php
@@ -531,13 +531,15 @@ class Storage {
                        $files = $view->getDirectoryContent($dir);
 
                        foreach ($files as $file) {
+                               $fileData = $file->getData();
+                               $filePath = $dir . '/' . $fileData['name'];
                                if ($file['type'] === 'dir') {
-                                       array_push($dirs, $file['path']);
+                                       array_push($dirs, $filePath);
                                } else {
-                                       $versionsBegin = strrpos($file['path'], '.v');
+                                       $versionsBegin = strrpos($filePath, '.v');
                                        $relPathStart = strlen(self::VERSIONS_ROOT);
-                                       $version = substr($file['path'], $versionsBegin + 2);
-                                       $relpath = substr($file['path'], $relPathStart, $versionsBegin - $relPathStart);
+                                       $version = substr($filePath, $versionsBegin + 2);
+                                       $relpath = substr($filePath, $relPathStart, $versionsBegin - $relPathStart);
                                        $key = $version . '#' . $relpath;
                                        $versions[$key] = array('path' => $relpath, 'timestamp' => $version);
                                }