Browse Source
Construct path to the version file from the current directory and filename. Fixes #22450
remotes/origin/htaccess_update
Victor Dubiniuk
10 years ago
committed by
Vincent Petry
No known key found for this signature in database
GPG Key ID: AF8F9EFC56562186
1 changed files with
6 additions and
4 deletions
-
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); |
|
|
|
} |
|
|
|
|
