diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2013-02-28 10:39:23 -0500 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-02-28 10:39:23 -0500 |
| commit | b5989c933f3c51887724d89e989a3e2af4207d6e (patch) | |
| tree | 40677bfa8daa1357b1ca3a561b551a142cbe6c82 /lib/public/share.php | |
| parent | ea83acedebbcf70b19643efe82b72fb139cf8ad2 (diff) | |
| parent | 93e713d3781c5d5fc6d0dbb6c6a0a8f9c2e15b97 (diff) | |
| download | nextcloud-server-b5989c933f3c51887724d89e989a3e2af4207d6e.tar.gz nextcloud-server-b5989c933f3c51887724d89e989a3e2af4207d6e.zip | |
Merge branch 'master' into shared-folder-etags
Conflicts:
apps/files_sharing/lib/sharedstorage.php
Diffstat (limited to 'lib/public/share.php')
| -rw-r--r-- | lib/public/share.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/public/share.php b/lib/public/share.php index 3d157b1a5f9..f3c1da74761 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -407,7 +407,7 @@ class Share { 'itemSource' => $itemSource, 'shareType' => $shareType, 'shareWith' => $shareWith, - )); + )); self::delete($item['id']); return true; } @@ -427,7 +427,7 @@ class Share { 'itemType' => $itemType, 'itemSource' => $itemSource, 'shares' => $shares - )); + )); foreach ($shares as $share) { self::delete($share['id']); } @@ -871,7 +871,7 @@ class Share { if ( isset($row['uid_owner']) && $row['uid_owner'] != '') { $row['displayname_owner'] = \OCP\User::getDisplayName($row['uid_owner']); } - + $items[$row['id']] = $row; } if (!empty($items)) { |