summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoricewind1991 <robin@icewind.nl>2014-04-25 14:03:43 +0200
committericewind1991 <robin@icewind.nl>2014-04-25 14:03:43 +0200
commit6925e722fa16c1f93d9c4b523cc00ab3ea624296 (patch)
treedd4a4697d602e9bd57168b7977a4ac7b0bc6748a
parentb41fc7cb7a4ba8a3fd11f8523c69db59c2c1ae3b (diff)
parent456ca0cf7d8fd259e58ea302b6849db5a001ce15 (diff)
downloadnextcloud-server-6925e722fa16c1f93d9c4b523cc00ab3ea624296.tar.gz
nextcloud-server-6925e722fa16c1f93d9c4b523cc00ab3ea624296.zip
Merge pull request #8351 from owncloud/search-mime-substorage
fix paths of searchByMime results on substorages
-rw-r--r--lib/private/files/view.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 58dfc73dcf3..93d2c15c50b 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -1109,8 +1109,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);
}
}
}