summaryrefslogtreecommitdiffstats
path: root/lib/public/share.php
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2013-08-30 15:39:43 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2013-08-30 15:39:43 +0200
commit10cf1b3a4e03dfa908d9dfc7cae85e9bd418e5bf (patch)
tree64548871f1d99e734fdb424511a70ff0cd866da2 /lib/public/share.php
parent77adaee6457c3e17d0f0b32c74da4cdbfce60164 (diff)
downloadnextcloud-server-10cf1b3a4e03dfa908d9dfc7cae85e9bd418e5bf.tar.gz
nextcloud-server-10cf1b3a4e03dfa908d9dfc7cae85e9bd418e5bf.zip
return mailSend status in getItems()
Diffstat (limited to 'lib/public/share.php')
-rw-r--r--lib/public/share.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/public/share.php b/lib/public/share.php
index eac6fab2b6a..c2dd0096ab9 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -1030,19 +1030,19 @@ class Share {
if ($format == self::FORMAT_STATUSES) {
if ($itemType == 'file' || $itemType == 'folder') {
$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`,'
- .' `share_type`, `file_source`, `path`, `expiration`, `storage`';
+ .' `share_type`, `file_source`, `path`, `expiration`, `storage`, `mail_send`';
} else {
- $select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `expiration`';
+ $select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `expiration`, `mail_send`';
}
} else {
if (isset($uidOwner)) {
if ($itemType == 'file' || $itemType == 'folder') {
$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`,'
.' `share_type`, `share_with`, `file_source`, `path`, `permissions`, `stime`,'
- .' `expiration`, `token`, `storage`';
+ .' `expiration`, `token`, `storage`, `storage`, `mail_send`';
} else {
$select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `share_with`, `permissions`,'
- .' `stime`, `file_source`, `expiration`, `token`';
+ .' `stime`, `file_source`, `expiration`, `token`, `storage`, `mail_send`';
}
} else {
if ($fileDependent) {
@@ -1053,11 +1053,11 @@ class Share {
$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `uid_owner`, '
.'`share_type`, `share_with`, `file_source`, `path`, `file_target`, '
.'`permissions`, `expiration`, `storage`, `*PREFIX*filecache`.`parent` as `file_parent`, '
- .'`name`, `mtime`, `mimetype`, `mimepart`, `size`, `encrypted`, `etag`';
+ .'`name`, `mtime`, `mimetype`, `mimepart`, `size`, `encrypted`, `etag`, `storage`, `mail_send`';
} else {
$select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`,
`*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`,
- `file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`, `token`, `storage`';
+ `file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`, `token`, `storage`, `storage`, `mail_send`';
}
} else {
$select = '*';