mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #25039 from owncloud/stable9-construct-path 

[Stable9] Construct path to the version file from the current directory and fil…
This commit is contained in:
Vincent Petry 2016-06-09 16:21:19 +02:00
parent 72b76228fc f5d83e85b7
commit 251a24b0cb
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/files_versions/lib/storage.php
View File

@ -532,13 +532,15 @@ class Storage {
$files = $view->getDirectoryContent($dir); $files = $view->getDirectoryContent($dir);
foreach ($files as $file) { foreach ($files as $file) {
$fileData = $file->getData();
$filePath = $dir . '/' . $fileData['name'];
if ($file['type'] === 'dir') { if ($file['type'] === 'dir') {
array_push($dirs, $file['path']); array_push($dirs, $filePath);
} else { } else {
$versionsBegin = strrpos($file['path'], '.v'); $versionsBegin = strrpos($filePath, '.v');
$relPathStart = strlen(self::VERSIONS_ROOT); $relPathStart = strlen(self::VERSIONS_ROOT);
$version = substr($file['path'], $versionsBegin + 2); $version = substr($filePath, $versionsBegin + 2);
$relpath = substr($file['path'], $relPathStart, $versionsBegin - $relPathStart); $relpath = substr($filePath, $relPathStart, $versionsBegin - $relPathStart);
$key = $version . '#' . $relpath; $key = $version . '#' . $relpath;
$versions[$key] = array('path' => $relpath, 'timestamp' => $version); $versions[$key] = array('path' => $relpath, 'timestamp' => $version);
} }