From ef08383eefc865f45407373b3e0737ef0f7ca982 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 1 Jul 2016 11:12:04 +0200
Subject: [PATCH] filesize_h might not be used in HTML content only #1622
Using an HTML entitiy might be problematic in non HTML renderers or when
the output is escaped again.
---
_test/tests/inc/parser/parser_media.test.php | 4 ++--
inc/common.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/_test/tests/inc/parser/parser_media.test.php b/_test/tests/inc/parser/parser_media.test.php
index 7d2ff49a2..0ed52b9f8 100644
--- a/_test/tests/inc/parser/parser_media.test.php
+++ b/_test/tests/inc/parser/parser_media.test.php
@@ -118,12 +118,12 @@ class TestOfDoku_Parser_Media extends TestOfDoku_Parser {
$this->assertNotSame(false, $substr_start, 'Substring not found.');
// find $a_webm in $url
- $a_webm = '<a href="' . DOKU_BASE . 'lib/exe/fetch.php?id=&cache=&media=wiki:kind_zu_katze.webm" class="media mediafile mf_webm" title="wiki:kind_zu_katze.webm (99.1 KB)">kind_zu_katze.webm</a>';
+ $a_webm = '<a href="' . DOKU_BASE . 'lib/exe/fetch.php?id=&cache=&media=wiki:kind_zu_katze.webm" class="media mediafile mf_webm" title="wiki:kind_zu_katze.webm (99.1'."\xC2\xA0".'KB)">kind_zu_katze.webm</a>';
$substr_start = strpos($url, $a_webm, $substr_start + strlen($source_ogv));
$this->assertNotSame(false, $substr_start, 'Substring not found.');
// find $a_webm in $url
- $a_ogv = '<a href="' . DOKU_BASE . 'lib/exe/fetch.php?id=&cache=&media=wiki:kind_zu_katze.ogv" class="media mediafile mf_ogv" title="wiki:kind_zu_katze.ogv (44.8 KB)">kind_zu_katze.ogv</a>';
+ $a_ogv = '<a href="' . DOKU_BASE . 'lib/exe/fetch.php?id=&cache=&media=wiki:kind_zu_katze.ogv" class="media mediafile mf_ogv" title="wiki:kind_zu_katze.ogv (44.8'."\xC2\xA0".'KB)">kind_zu_katze.ogv</a>';
$substr_start = strpos($url, $a_ogv, $substr_start + strlen($a_webm));
$this->assertNotSame(false, $substr_start, 'Substring not found.');
diff --git a/inc/common.php b/inc/common.php
index d0c5b4e87..01b4a9ccb 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -1477,7 +1477,7 @@ function filesize_h($size, $dec = 1) {
$i++;
}
- return round($size, $dec).' '.$sizes[$i];
+ return round($size, $dec)."\xC2\xA0".$sizes[$i]; //non-breaking space
}
/**
--
GitLab