Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2014-08-05 19:25:55 +0400
committerVincent Petry <pvince81@owncloud.com>2015-03-06 15:48:38 +0300
commita917b78c3c43b594a7eaaaa367ee344f92ba4a00 (patch)
treefe45a7206acaceb935abc19066ef043bcc8d37eb /apps
parent87345f80ea6063ce0e09539621457c4ba1998fb4 (diff)
make sure that the versions array contains the correct path
Diffstat (limited to 'apps')
-rw-r--r--apps/files_versions/lib/versions.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index c54ed3fdd9a..3916ed7d380 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -280,7 +280,7 @@ class Storage {
$pathinfo = pathinfo($filename);
$versionedFile = $pathinfo['basename'];
- $dir = self::VERSIONS_ROOT . '/' . $pathinfo['dirname'];
+ $dir = \OC\Files\Filesystem::normalizePath(self::VERSIONS_ROOT . '/' . $pathinfo['dirname']);
$dirContent = false;
if ($view->is_dir($dir)) {
@@ -308,7 +308,7 @@ class Storage {
} else {
$versions[$key]['preview'] = \OCP\Util::linkToRoute('core_ajax_versions_preview', array('file' => $userFullPath, 'version' => $timestamp));
}
- $versions[$key]['path'] = $filename;
+ $versions[$key]['path'] = $pathinfo['dirname'] . '/' . $filename;
$versions[$key]['name'] = $versionedFile;
$versions[$key]['size'] = $view->filesize($dir . '/' . $entryName);
}