From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 19 Jan 2013 04:56:47 +0000 (-0500)
Subject: Fix merge
X-Git-Tag: v5.0.0alpha1~171^2~39
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5df6f9d14d5a05d91d6706b420c8ad9a387a9f6d;p=nextcloud-server.git

Fix merge
---

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`';
 					}