diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2013-01-18 23:56:47 -0500 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-01-18 23:56:47 -0500 |
| commit | 5df6f9d14d5a05d91d6706b420c8ad9a387a9f6d (patch) | |
| tree | dcbad91ff72cb4baf76e26f24c939d3c1568b2a7 /lib/public | |
| parent | 6871a150bd1309af0ca22e45487043d9640bb356 (diff) | |
| download | nextcloud-server-5df6f9d14d5a05d91d6706b420c8ad9a387a9f6d.tar.gz nextcloud-server-5df6f9d14d5a05d91d6706b420c8ad9a387a9f6d.zip | |
Fix merge
Diffstat (limited to 'lib/public')
| -rw-r--r-- | lib/public/share.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/public/share.php b/lib/public/share.php index 9d2a64b4590..5f9ad7fc09d 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -684,13 +684,13 @@ class Share { } else { if ($fileDependent) { if (($itemType == 'file' || $itemType == 'folder') - && $format == \OC_Share_Backend_File::FORMAT_FILE_APP + && $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`, ' - .'`share_type`, `share_with`, `file_source`, `path`, `file_target`, `permissions`, ' - .'`expiration`, `name`, `ctime`, `mtime`, `mimetype`, `size`, `encrypted`, ' - .'`versioned`, `writable`'; + .'`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`'; } 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`'; } |