diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-02-07 14:49:22 +0100 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-02-07 14:49:22 +0100 |
| commit | 60cba9962da352d96489e4eb4110612cac49966a (patch) | |
| tree | c3e9fd2af52c8d8216f790b8a0ce519c61bab3a5 /lib | |
| parent | f0afbffaef1bd08eff55ba2c2071ab05d619b043 (diff) | |
| parent | a8943ad02207afbf142ec48f4b53cbe1be943253 (diff) | |
| download | nextcloud-server-60cba9962da352d96489e4eb4110612cac49966a.tar.gz nextcloud-server-60cba9962da352d96489e4eb4110612cac49966a.zip | |
Merge pull request #7112 from owncloud/enc_fix_size_for_shared_files
replace 'size' with 'unencrypted_size' if encryption is enabled
Diffstat (limited to 'lib')
| -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 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`, |