diff options
| author | Andreas Fischer <bantu@owncloud.com> | 2013-10-10 18:56:50 +0200 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-11-03 12:34:40 +0100 |
| commit | 7c1f0da0fe5bcdae649e44db034d627a827f3db5 (patch) | |
| tree | 45f16299fd2bcf9d960b1ddff06e4454b37f000b /lib/public | |
| parent | fa56aec4b88dd44f7ffd2e80c2518a7ec8ce9126 (diff) | |
| download | nextcloud-server-7c1f0da0fe5bcdae649e44db034d627a827f3db5.tar.gz nextcloud-server-7c1f0da0fe5bcdae649e44db034d627a827f3db5.zip | |
Always select item_source.
Diffstat (limited to 'lib/public')
| -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 cde141fc4f9..7f4d918757f 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -1091,7 +1091,7 @@ class Share { // TODO Optimize selects if ($format == self::FORMAT_STATUSES) { if ($itemType == 'file' || $itemType == 'folder') { - $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`,' + $select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `*PREFIX*share`.`parent`,' .' `share_type`, `file_source`, `path`, `expiration`, `storage`, `mail_send`'; } else { $select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `expiration`, `mail_send`'; @@ -1099,7 +1099,7 @@ class Share { } else { if (isset($uidOwner)) { if ($itemType == 'file' || $itemType == 'folder') { - $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`,' + $select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `*PREFIX*share`.`parent`,' .' `share_type`, `share_with`, `file_source`, `path`, `permissions`, `stime`,' .' `expiration`, `token`, `storage`, `mail_send`'; } else { @@ -1112,7 +1112,7 @@ class Share { && $format == \OC_Share_Backend_File::FORMAT_GET_FOLDER_CONTENTS || $format == \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT ) { - $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `uid_owner`, ' + $select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `*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`, `mail_send`'; |