summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2014-11-18 18:11:31 +0100
committerLukas Reschke <lukas@owncloud.com>2014-11-18 18:11:31 +0100
commit3b0a7574d6d48eba1e2e047886fe4aa630948005 (patch)
tree39dec24abd416f3d9f20b33caa1d4075b1227f37
parent106d0f9c754c91810a798de3628a0361062982ca (diff)
parent1b85f40cbeb339fb198fd7a7a1203d614fcb77cd (diff)
downloadnextcloud-server-3b0a7574d6d48eba1e2e047886fe4aa630948005.tar.gz
nextcloud-server-3b0a7574d6d48eba1e2e047886fe4aa630948005.zip
Merge pull request #12264 from owncloud/use-full-path-for-filesize-calculation
Use full path instead of only the filename
-rw-r--r--apps/files_sharing/lib/controllers/sharecontroller.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php
index a3d5b6d44a0..e5fd0f401c2 100644
--- a/apps/files_sharing/lib/controllers/sharecontroller.php
+++ b/apps/files_sharing/lib/controllers/sharecontroller.php
@@ -173,7 +173,7 @@ class ShareController extends Controller {
$shareTmpl['server2serversharing'] = Helper::isOutgoingServer2serverShareEnabled();
$shareTmpl['protected'] = isset($linkItem['share_with']) ? 'true' : 'false';
$shareTmpl['dir'] = $dir;
- $shareTmpl['fileSize'] = \OCP\Util::humanFileSize(\OC\Files\Filesystem::filesize($file));
+ $shareTmpl['fileSize'] = \OCP\Util::humanFileSize(\OC\Files\Filesystem::filesize($originalSharePath));
// Show file list
if (Filesystem::is_dir($originalSharePath)) {