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