diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-19 16:07:43 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-19 16:07:43 +0100 |
| commit | f8677628d4ce9e47b1c7760291bb41d7d3cf6ed1 (patch) | |
| tree | 2821bb7a72af23779b6ef20d058cb79e0d4a417f /apps | |
| parent | fb38625741f6e8ca2d9601830a5afa537d43f8ce (diff) | |
| parent | 4ef035cc61d1e5f357485d3403357fe745be72d7 (diff) | |
| download | nextcloud-server-f8677628d4ce9e47b1c7760291bb41d7d3cf6ed1.tar.gz nextcloud-server-f8677628d4ce9e47b1c7760291bb41d7d3cf6ed1.zip | |
Merge pull request #22503 from owncloud/issue_22500
When (re-)sharing an incomming federated share set the corrent owner
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_versions/lib/storage.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/storage.php index da736c868fc..4eac476ed66 100644 --- a/apps/files_versions/lib/storage.php +++ b/apps/files_versions/lib/storage.php @@ -104,6 +104,9 @@ class Storage { $ownerView = new View('/'.$uid.'/files'); try { $filename = $ownerView->getPath($info['fileid']); + // make sure that the file name doesn't end with a trailing slash + // can for example happen single files shared across servers + $filename = rtrim($filename, '/'); } catch (NotFoundException $e) { $filename = null; } |