From 13e7efff9002b30a9868fea9e15f221d0d1a2e7d Mon Sep 17 00:00:00 2001
From: szaimen <szaimen@e.mail.de>
Date: Wed, 9 Feb 2022 09:47:44 +0100
Subject: Revert "Add non-breaking space in the file size"

Signed-off-by: szaimen <szaimen@e.mail.de>
---
 apps/files_sharing/lib/Controller/ShareController.php       | 2 +-
 apps/files_sharing/templates/public.php                     | 4 ++--
 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 cce118f6d6f..ffd2413e901 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(' ', '&nbsp;', \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'])?>&nbsp;(<?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&nbsp;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&nbsp;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&nbsp;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&nbsp;KB',
+			'fileSize' => '1 KB',
 			'nonHumanFileSize' => 1337,
 			'maxSizeAnimateGif' => null,
 			'previewSupported' => null,
-- 
cgit v1.2.3