diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2014-03-13 20:27:07 +0100 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2014-03-13 20:27:07 +0100 |
| commit | b2757e621c1dfd9d9993636e74bdebf01dce51e0 (patch) | |
| tree | 9db932790a754ad8f36875e7fd3ef68915bdd804 /lib/public/share.php | |
| parent | a7695b8dd099302fc0c080642c9dc9d288c9665f (diff) | |
| parent | 9d32475260b71b97c3fc7f8bf63e1c51e55f210e (diff) | |
| download | nextcloud-server-b2757e621c1dfd9d9993636e74bdebf01dce51e0.tar.gz nextcloud-server-b2757e621c1dfd9d9993636e74bdebf01dce51e0.zip | |
Merge pull request #7686 from owncloud/ocs_fix_paths
finally fix the paths for the OCS Share API
Diffstat (limited to 'lib/public/share.php')
| -rw-r--r-- | lib/public/share.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/public/share.php b/lib/public/share.php index dd9e1bbf9a9..5066d40354d 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -1250,10 +1250,12 @@ class Share { // Remove root from file source paths if retrieving own shared items if (isset($uidOwner) && isset($row['path'])) { if (isset($row['parent'])) { + // FIXME: Doesn't always construct the correct path, example: + // Folder '/a/b', share '/a' and '/a/b' to user2 + // user2 reshares /Shared/b and ask for share status of /Shared/a/b + // expected result: path=/Shared/a/b; actual result /Shared/b because of the parent $query = \OC_DB::prepare('SELECT `file_target` FROM `*PREFIX*share` WHERE `id` = ?'); $parentResult = $query->execute(array($row['parent'])); - //$query = \OC_DB::prepare('SELECT `file_target` FROM `*PREFIX*share` WHERE `id` = ?'); - //$parentResult = $query->execute(array($row['id'])); if (\OC_DB::isError($result)) { \OC_Log::write('OCP\Share', 'Can\'t select parent: ' . \OC_DB::getErrorMessage($result) . ', select=' . $select . ' where=' . $where, |