diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2012-10-22 11:48:30 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2012-10-22 11:48:30 +0200 |
| commit | 2e5ce9f4ec1cde3d4853f2d502f3358705dc1ce5 (patch) | |
| tree | b1d71ff7ee00db055046d5a0d526ed1ccd237a64 | |
| parent | cc67ae9dbb378fc2f5444fdb420ce28802c77686 (diff) | |
| download | nextcloud-server-2e5ce9f4ec1cde3d4853f2d502f3358705dc1ce5.tar.gz nextcloud-server-2e5ce9f4ec1cde3d4853f2d502f3358705dc1ce5.zip | |
don't call OC_Filesystem::normalizePath() but simply remove trailing slashes.
(OC_Filesystem::normalizePath() triggers some strange side effects)
| -rw-r--r-- | apps/files_sharing/public.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index 5c0f37c8f91..7e2da1b6344 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -24,12 +24,18 @@ if (isset($_GET['token'])) { if (isset($_GET['file']) || isset($_GET['dir'])) { if (isset($_GET['dir'])) { $type = 'folder'; - $path = OC_Filesystem::normalizePath($_GET['dir']); + $path = $_GET['dir']; + if($stripTrailingSlash and strlen($path)>1 and substr($path,-1,1)==='/') {
+ $path=substr($path,0,-1);
+ } $baseDir = $path; $dir = $baseDir; } else { $type = 'file'; - $path = OC_Filesystem::normalizePath($_GET['file']); + $path = $_GET['file']; + if($stripTrailingSlash and strlen($path)>1 and substr($path,-1,1)==='/') {
+ $path=substr($path,0,-1);
+ } } $uidOwner = substr($path, 1, strpos($path, '/', 1) - 1); if (OCP\User::userExists($uidOwner)) { |