summaryrefslogtreecommitdiffstats
path: root/lib/public
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2014-02-11 13:26:54 +0100
committerRobin Appelman <icewind@owncloud.com>2014-02-11 13:26:54 +0100
commita7c50514aca27dc3649f69536ca2a557f72aec99 (patch)
tree43e078e6a0ac4dafdd205b4c5b056cbf4a50fad4 /lib/public
parent4cdf83e6d257c57ebad60e60dec474faa83a51d9 (diff)
parent72f134cfce05eb089a6d8271e73d6eb95cbe94a4 (diff)
downloadnextcloud-server-a7c50514aca27dc3649f69536ca2a557f72aec99.tar.gz
nextcloud-server-a7c50514aca27dc3649f69536ca2a557f72aec99.zip
Merge branch 'master' into convert-oc_appconfig
Diffstat (limited to 'lib/public')
-rw-r--r--lib/public/share.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/public/share.php b/lib/public/share.php
index f832d04a70f..ae7d29e8b87 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -1152,7 +1152,7 @@ class Share {
$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`';
+ .'`name`, `mtime`, `mimetype`, `mimepart`, `size`, `unencrypted_size`, `encrypted`, `etag`, `mail_send`';
} else {
$select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`,
`*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`,