Revert "Add non-breaking space in the file size"

Signed-off-by: szaimen <szaimen@e.mail.de>

diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php
index b4a332d74198e9018d17a18d76542686e6bba6a0..614dae7ffba6a7878d02b2d53dbbd94423371bed 100644 (file)
--- 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 677f015ce81d66c3bf8f462f79991f7685ef27f3..33dd6ecd1898d5fce7178dc1c7cd6912309a5d0c 100644 (file)
--- 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 512a61d811e324cc2f65b4680a3af163ff41474b..be2616f70fc90d930e193dfae86f77bb0d2ebba3 100644 (file)
--- 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,