Fix merge

diff --git a/lib/public/share.php b/lib/public/share.php
index 9d2a64b459085db7f4b0e86ab1897d6b624bf6fd..5f9ad7fc09d8200d8107f2218d0bca6c087ef127 100644 (file)
--- 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`';
                                        }