diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2012-08-25 00:06:20 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2012-08-25 00:06:20 +0200 |
| commit | fd5af9aff4245127f32f3b90dbd6e52792984447 (patch) | |
| tree | f77a3b903067f05f036578835700f262f6ea71a9 /core/ajax/share.php | |
| parent | c8255a170c2d7449b4e7728edd2237eea71dca80 (diff) | |
| parent | d84b1adf34817b4b261db35e51f72ac78adf8e27 (diff) | |
| download | nextcloud-server-fd5af9aff4245127f32f3b90dbd6e52792984447.tar.gz nextcloud-server-fd5af9aff4245127f32f3b90dbd6e52792984447.zip | |
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
Diffstat (limited to 'core/ajax/share.php')
| -rw-r--r-- | core/ajax/share.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/core/ajax/share.php b/core/ajax/share.php index 04294a36ac0..806ca9fb98f 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -56,9 +56,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo } break; case 'getItem': - if (isset($_GET['itemType']) && isset($_GET['itemSource']) && isset($_GET['checkShares'])) { - $reshare = OCP\Share::getItemSharedWithBySource($_GET['itemType'], $_GET['itemSource'], OCP\Share::FORMAT_NONE, null, true); - if ($_GET['checkShares'] == "true") { + if (isset($_GET['itemType']) && isset($_GET['itemSource']) && isset($_GET['checkReshare']) && isset($_GET['checkShares'])) { + if ($_GET['checkReshare'] == 'true') { + $reshare = OCP\Share::getItemSharedWithBySource($_GET['itemType'], $_GET['itemSource'], OCP\Share::FORMAT_NONE, null, true); + } else { + $reshare = false; + } + if ($_GET['checkShares'] == 'true') { $shares = OCP\Share::getItemShared($_GET['itemType'], $_GET['itemSource']); } else { $shares = false; |