diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-04-25 11:47:06 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-04-25 11:47:06 +0200 |
| commit | 6c20a014eaecd19c3f68143485c6f74891ee9643 (patch) | |
| tree | 84bd8e37536e7f28a25afd7586c209d38a25d610 /apps/files_sharing/lib/api.php | |
| parent | cd0c5990f895bcdce47acf2dbf11ebadd920a404 (diff) | |
| parent | 3fc809dfd80a296d7da922a06f9e13d446b3d3f0 (diff) | |
| download | nextcloud-server-6c20a014eaecd19c3f68143485c6f74891ee9643.tar.gz nextcloud-server-6c20a014eaecd19c3f68143485c6f74891ee9643.zip | |
merge master into webdav-injection
Diffstat (limited to 'apps/files_sharing/lib/api.php')
| -rw-r--r-- | apps/files_sharing/lib/api.php | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/apps/files_sharing/lib/api.php b/apps/files_sharing/lib/api.php index de3c1cd2630..438d3cc4ba3 100644 --- a/apps/files_sharing/lib/api.php +++ b/apps/files_sharing/lib/api.php @@ -184,7 +184,6 @@ class Api { $receivedFrom = \OCP\Share::getItemSharedWithBySource($itemType, $file['fileid']); reset($share); $key = key($share); - $share[$key]['path'] = self::correctPath($share[$key]['path'], $path); if ($receivedFrom) { $share[$key]['received_from'] = $receivedFrom['uid_owner']; $share[$key]['received_from_displayname'] = \OCP\User::getDisplayName($receivedFrom['uid_owner']); @@ -531,15 +530,4 @@ class Api { } - /** - * @brief make sure that the path has the correct root - * - * @param string $path path returned from the share API - * @param string $folder current root folder - * @return string the correct path - */ - protected static function correctPath($path, $folder) { - return \OC_Filesystem::normalizePath('/' . $folder . '/' . basename($path)); - } - } |