summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/ajax/getitem.php
diff options
context:
space:
mode:
authorMichael Gapczynski <GapczynskiM@gmail.com>2011-08-08 15:49:16 -0400
committerMichael Gapczynski <GapczynskiM@gmail.com>2011-08-08 15:49:16 -0400
commit23c8d7b3fb316daa7c70552ed47e63e9bbcd300f (patch)
tree581f69c730a05773bac4a9eab122cd4c9a7f8d9a /apps/files_sharing/ajax/getitem.php
parent968f1282ce6a6cb36f175a28fc078f6dfcfc6d45 (diff)
downloadnextcloud-server-23c8d7b3fb316daa7c70552ed47e63e9bbcd300f.tar.gz
nextcloud-server-23c8d7b3fb316daa7c70552ed47e63e9bbcd300f.zip
Show which parent folder is shared with the user in the sharing drop down
Diffstat (limited to 'apps/files_sharing/ajax/getitem.php')
-rw-r--r--apps/files_sharing/ajax/getitem.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/apps/files_sharing/ajax/getitem.php b/apps/files_sharing/ajax/getitem.php
index 3a3be404a30..43105d334ee 100644
--- a/apps/files_sharing/ajax/getitem.php
+++ b/apps/files_sharing/ajax/getitem.php
@@ -9,12 +9,14 @@ $source = $userDirectory.$_GET['source'];
$users = OC_Share::getMySharedItem($source);
$source = dirname($source);
while ($source != "" && $source != "/" && $source != "." && $source != $userDirectory) {
- $parentUsers = array();
$values = array_values(OC_Share::getMySharedItem($source));
- for ($i = 0; $i < count($values); $i++) {
- $parentUsers[basename($source)."-".$i] = $values[$i];
+ if (count($values) > 0) {
+ $parentUsers = array();
+ for ($i = 0; $i < count($values); $i++) {
+ $parentUsers[basename($source)."-".$i] = $values[$i];
+ }
+ $users = array_merge($users, $parentUsers);
}
- $users = array_merge($users, $parentUsers);
$source = dirname($source);
}
echo json_encode($users);