summaryrefslogtreecommitdiffstats
path: root/lib/public
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2014-02-10 14:01:32 +0100
committerRobin Appelman <icewind@owncloud.com>2014-02-10 14:01:32 +0100
commit753af3a3ff17d9126a738f292b3922981bd5673d (patch)
treec793d68a693ff82d70febb7ad3bce1092037b595 /lib/public
parent1e79369338e8435952e2eda60a2cfc49bb6c4882 (diff)
parent02bdb470498fb8b71f1bc582af2f55795a719c39 (diff)
downloadnextcloud-server-753af3a3ff17d9126a738f292b3922981bd5673d.tar.gz
nextcloud-server-753af3a3ff17d9126a738f292b3922981bd5673d.zip
Merge branch 'master' into storagestatistics-reuse
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`,