diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2012-10-08 13:34:19 +0200 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2012-10-08 13:34:19 +0200 |
| commit | f304ec14823e96d634e9085f7ad701666245484b (patch) | |
| tree | 6da5cac602bfb1aac6e41e0011bc5f843e87e60e | |
| parent | 306bfb44d3533a2ba28db409b9826a8e82c55675 (diff) | |
| parent | 8357754ff15a090ec3d452cd8b98106a68ec1f68 (diff) | |
| download | nextcloud-server-f304ec14823e96d634e9085f7ad701666245484b.tar.gz nextcloud-server-f304ec14823e96d634e9085f7ad701666245484b.zip | |
Merge branch 'master' of https://github.com/owncloud/core
| -rw-r--r-- | lib/public/share.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/public/share.php b/lib/public/share.php index 59dbad035aa..75363d081c0 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -645,7 +645,7 @@ class Share { } else {
if ($fileDependent) {
if (($itemType == 'file' || $itemType == 'folder') && $format == \OC_Share_Backend_File::FORMAT_FILE_APP || $format == \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT) {
- $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path`, `file_target`, `permissions`, `expiration`, `name`, `ctime`, `mtime`, `mimetype`, `size`, `encrypted`, `versioned`, `writable`';
+ $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`';
} 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`';
}
|