Fix overwriting of internal sharing for shared folders - bug oc-260
This commit is contained in:
parent
71a2241aee
commit
87627c7a50
|
@ -8,6 +8,7 @@ require_once('../lib_share.php');
|
||||||
$userDirectory = "/".OC_User::getUser()."/files";
|
$userDirectory = "/".OC_User::getUser()."/files";
|
||||||
$source = $userDirectory.$_GET['source'];
|
$source = $userDirectory.$_GET['source'];
|
||||||
$path = $source;
|
$path = $source;
|
||||||
|
$users = array();
|
||||||
if ($users = OC_Share::getMySharedItem($source)) {
|
if ($users = OC_Share::getMySharedItem($source)) {
|
||||||
for ($i = 0; $i < count($users); $i++) {
|
for ($i = 0; $i < count($users); $i++) {
|
||||||
if ($users[$i]['uid_shared_with'] == OC_Share::PUBLICLINK) {
|
if ($users[$i]['uid_shared_with'] == OC_Share::PUBLICLINK) {
|
||||||
|
@ -19,7 +20,6 @@ $source = dirname($source);
|
||||||
while ($source != "" && $source != "/" && $source != "." && $source != $userDirectory) {
|
while ($source != "" && $source != "/" && $source != "." && $source != $userDirectory) {
|
||||||
if ($values = OC_Share::getMySharedItem($source)) {
|
if ($values = OC_Share::getMySharedItem($source)) {
|
||||||
$values = array_values($values);
|
$values = array_values($values);
|
||||||
$users = array();
|
|
||||||
$parentUsers = array();
|
$parentUsers = array();
|
||||||
for ($i = 0; $i < count($values); $i++) {
|
for ($i = 0; $i < count($values); $i++) {
|
||||||
if ($values[$i]['uid_shared_with'] == OC_Share::PUBLICLINK) {
|
if ($values[$i]['uid_shared_with'] == OC_Share::PUBLICLINK) {
|
||||||
|
|
Loading…
Reference in New Issue