]> source.dussan.org Git - nextcloud-server.git/commitdiff
Always select item_source.
authorAndreas Fischer <bantu@owncloud.com>
Thu, 10 Oct 2013 16:56:50 +0000 (18:56 +0200)
committerMorris Jobke <morris.jobke@gmail.com>
Sun, 3 Nov 2013 11:34:40 +0000 (12:34 +0100)
lib/public/share.php

index cde141fc4f92c6c6f667210be676e88e65ba2301..7f4d918757f426c38389efc8b9284dd433438177 100644 (file)
@@ -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`';