diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-04-25 14:04:41 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-04-25 14:04:41 +0200 |
| commit | 194ea66cb51186be46a090c0ee915dcaf068fe94 (patch) | |
| tree | a8e28dc4dbdd17555988c9d1f34435f5758aa6c9 /lib | |
| parent | b42418246f3c0d623fc9cd028e905ac3b1303a9f (diff) | |
| parent | 6925e722fa16c1f93d9c4b523cc00ab3ea624296 (diff) | |
| download | nextcloud-server-194ea66cb51186be46a090c0ee915dcaf068fe94.tar.gz nextcloud-server-194ea66cb51186be46a090c0ee915dcaf068fe94.zip | |
Merge branch 'master' into share-search-mime
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/files/view.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/files/view.php b/lib/private/files/view.php index 5a3872e66e0..31ec8cfacff 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -1110,8 +1110,9 @@ class View { if ($results) { foreach ($results as $result) { $internalPath = $result['path']; - $result['path'] = $relativeMountPoint . $result['path']; - $files[] = new FileInfo($mountPoint . $result['path'], $storage, $internalPath, $result); + $result['path'] = rtrim($relativeMountPoint . $result['path'], '/'); + $path = rtrim($mountPoint . $internalPath, '/'); + $files[] = new FileInfo($path, $storage, $internalPath, $result); } } } |