diff options
| author | szaimen <szaimen@e.mail.de> | 2022-02-09 09:47:44 +0100 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2022-02-10 16:47:40 +0000 |
| commit | 6bbfaee8bd3b055b8a8465b30ed4379f479db055 (patch) | |
| tree | 82d118a8b492c26fbbe1ef7f25dcd4c6f926b79f /apps/files_sharing | |
| parent | a87bd0ad407c515b20e9125c630dffee94edc76e (diff) | |
| download | nextcloud-server-6bbfaee8bd3b055b8a8465b30ed4379f479db055.tar.gz nextcloud-server-6bbfaee8bd3b055b8a8465b30ed4379f479db055.zip | |
Revert "Add non-breaking space in the file size"
Signed-off-by: szaimen <szaimen@e.mail.de>
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/lib/Controller/ShareController.php | 2 | ||||
| -rw-r--r-- | apps/files_sharing/templates/public.php | 4 | ||||
| -rw-r--r-- | apps/files_sharing/tests/Controller/ShareControllerTest.php | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php index b4a332d7419..614dae7ffba 100644 --- a/apps/files_sharing/lib/Controller/ShareController.php +++ b/apps/files_sharing/lib/Controller/ShareController.php @@ -385,7 +385,7 @@ class ShareController extends AuthPublicShareController { $shareTmpl['protected'] = $share->getPassword() !== null ? 'true' : 'false'; $shareTmpl['dir'] = ''; $shareTmpl['nonHumanFileSize'] = $shareNode->getSize(); - $shareTmpl['fileSize'] = str_replace(' ', ' ', \OCP\Util::humanFileSize($shareNode->getSize())); + $shareTmpl['fileSize'] = \OCP\Util::humanFileSize($shareNode->getSize()); $shareTmpl['hideDownload'] = $share->getHideDownload(); $hideFileList = false; diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 677f015ce81..33dd6ecd189 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -75,7 +75,7 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size); <?php if (isset($_['mimetype']) && strpos($_['mimetype'], 'image') === 0) { ?> <div class="directDownload"> <div> - <?php p($_['filename'])?> (<?php echo($_['fileSize']) ?>) + <?php p($_['filename'])?> (<?php p($_['fileSize']) ?>) </div> <a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button"> <span class="icon icon-download"></span> @@ -87,7 +87,7 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size); <?php if ($_['previewURL'] === $_['downloadURL'] && !$_['hideDownload']): ?> <div class="directDownload"> <div> - <?php p($_['filename'])?> (<?php echo($_['fileSize']) ?>) + <?php p($_['filename'])?> (<?php p($_['fileSize']) ?>) </div> <a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button"> <span class="icon icon-download"></span> diff --git a/apps/files_sharing/tests/Controller/ShareControllerTest.php b/apps/files_sharing/tests/Controller/ShareControllerTest.php index 512a61d811e..be2616f70fc 100644 --- a/apps/files_sharing/tests/Controller/ShareControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareControllerTest.php @@ -329,7 +329,7 @@ class ShareControllerTest extends \Test\TestCase { 'protected' => 'true', 'dir' => '', 'downloadURL' => 'downloadURL', - 'fileSize' => '33 B', + 'fileSize' => '33 B', 'nonHumanFileSize' => 33, 'maxSizeAnimateGif' => 10, 'previewSupported' => true, @@ -480,7 +480,7 @@ class ShareControllerTest extends \Test\TestCase { 'protected' => 'true', 'dir' => '', 'downloadURL' => 'downloadURL', - 'fileSize' => '33 B', + 'fileSize' => '33 B', 'nonHumanFileSize' => 33, 'maxSizeAnimateGif' => 10, 'previewSupported' => true, @@ -631,7 +631,7 @@ class ShareControllerTest extends \Test\TestCase { 'protected' => 'true', 'dir' => '', 'downloadURL' => 'downloadURL', - 'fileSize' => '33 B', + 'fileSize' => '33 B', 'nonHumanFileSize' => 33, 'maxSizeAnimateGif' => 10, 'previewSupported' => true, @@ -756,7 +756,7 @@ class ShareControllerTest extends \Test\TestCase { 'protected' => 'false', 'dir' => null, 'downloadURL' => '', - 'fileSize' => '1 KB', + 'fileSize' => '1 KB', 'nonHumanFileSize' => 1337, 'maxSizeAnimateGif' => null, 'previewSupported' => null, |