diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2014-09-25 12:35:11 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-09-25 12:35:11 +0200 |
| commit | 968152113e35b39bd18d1ad583dd86d11949e83c (patch) | |
| tree | e9b5c1bd8502fc6bac1bd47946dab1db7d47df29 /lib | |
| parent | d5fc011c9059a0362903abc85fa2af43a7dd89f4 (diff) | |
| download | nextcloud-server-968152113e35b39bd18d1ad583dd86d11949e83c.tar.gz nextcloud-server-968152113e35b39bd18d1ad583dd86d11949e83c.zip | |
always select permissions, used in getItems()
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/share/share.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/share/share.php b/lib/private/share/share.php index d681f35b03a..10b7acd9fed 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -1403,6 +1403,7 @@ class Share extends \OC\Share\Constants { } } } + if($checkExpireDate) { if (self::expireItem($row)) { continue; @@ -1905,9 +1906,9 @@ class Share extends \OC\Share\Constants { $select = '*'; if ($format == self::FORMAT_STATUSES) { if ($fileDependent) { - $select = '`*PREFIX*share`.`id`, `*PREFIX*share`.`parent`, `share_type`, `path`, `storage`, `share_with`, `uid_owner` , `file_source`, `stime`'; + $select = '`*PREFIX*share`.`id`, `*PREFIX*share`.`parent`, `share_type`, `path`, `storage`, `share_with`, `uid_owner` , `file_source`, `stime`, `*PREFIX*share`.`permissions`'; } else { - $select = '`id`, `parent`, `share_type`, `share_with`, `uid_owner`, `item_source`, `stime`'; + $select = '`id`, `parent`, `share_type`, `share_with`, `uid_owner`, `item_source`, `stime`, `*PREFIX*share`.`permissions`'; } } else { if (isset($uidOwner)) { |