summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
diff options
context:
space:
mode:
authorMichael Gapczynski <GapczynskiM@gmail.com>2012-02-18 19:30:35 -0500
committerMichael Gapczynski <GapczynskiM@gmail.com>2012-02-18 19:30:54 -0500
commit87627c7a503f10875d8fa0171624b6e586d1cc7b (patch)
treebd97475ff65aeff1b100822a1606c28043b388c2 /apps/files_sharing
parent71a2241aee6f5f372b43fe977e494fea8a98d9cd (diff)
downloadnextcloud-server-87627c7a503f10875d8fa0171624b6e586d1cc7b.tar.gz
nextcloud-server-87627c7a503f10875d8fa0171624b6e586d1cc7b.zip
Fix overwriting of internal sharing for shared folders - bug oc-260
Diffstat (limited to 'apps/files_sharing')
-rw-r--r--apps/files_sharing/ajax/getitem.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_sharing/ajax/getitem.php b/apps/files_sharing/ajax/getitem.php
index 51fda6aed40..ba01adffb9a 100644
--- a/apps/files_sharing/ajax/getitem.php
+++ b/apps/files_sharing/ajax/getitem.php
@@ -8,6 +8,7 @@ require_once('../lib_share.php');
$userDirectory = "/".OC_User::getUser()."/files";
$source = $userDirectory.$_GET['source'];
$path = $source;
+$users = array();
if ($users = OC_Share::getMySharedItem($source)) {
for ($i = 0; $i < count($users); $i++) {
if ($users[$i]['uid_shared_with'] == OC_Share::PUBLICLINK) {
@@ -19,7 +20,6 @@ $source = dirname($source);
while ($source != "" && $source != "/" && $source != "." && $source != $userDirectory) {
if ($values = OC_Share::getMySharedItem($source)) {
$values = array_values($values);
- $users = array();
$parentUsers = array();
for ($i = 0; $i < count($values); $i++) {
if ($values[$i]['uid_shared_with'] == OC_Share::PUBLICLINK) {