Browse Source

always select permissions, used in getItems()

tags/v8.0.0alpha1
Bjoern Schiessle 9 years ago
parent
commit
968152113e
1 changed files with 3 additions and 2 deletions
  1. 3
    2
      lib/private/share/share.php

+ 3
- 2
lib/private/share/share.php View File

@@ -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)) {

Loading…
Cancel
Save