clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11928 from MrPetovan/bug/11851-content-0 

Fix removing falsy text nodes in HTML::tagToBBCodeSub
This commit is contained in:
Michael Vogel 2022-09-25 07:28:54 +02:00 committed by GitHub
parent df559a24c0 3e1b6890b7
commit 81f7feabc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Content/Text/HTML.php
View File

@ -114,7 +114,7 @@ class HTML
/** @var \DOMNode $child */ /** @var \DOMNode $child */
foreach ($node->childNodes as $key => $child) { foreach ($node->childNodes as $key => $child) {
/* Remove empty text nodes at the start or at the end of the children list */ /* Remove empty text nodes at the start or at the end of the children list */
if ($key > 0 && $key < $node->childNodes->length - 1 || $child->nodeName != '#text' || trim($child->nodeValue)) { if ($key > 0 && $key < $node->childNodes->length - 1 || $child->nodeName != '#text' || trim($child->nodeValue) !== '') {
$newNode = $child->cloneNode(true); $newNode = $child->cloneNode(true);
$node->parentNode->insertBefore($newNode, $node); $node->parentNode->insertBefore($newNode, $node);
} }
@ -144,10 +144,10 @@ class HTML
public static function toBBCode(string $message, string $basepath = ''): string public static function toBBCode(string $message, string $basepath = ''): string
{ {
/* /*
* Check if message is empty to prevent a lot code below being executed * Check if message is empty to prevent a lot of code below from being executed
* for just an empty message. * for just an empty message.
*/ */
if (empty($message)) { if ($message === '') {
return ''; return '';
} }

4
tests/src/Content/Text/HTMLTest.php
View File

@ -82,6 +82,10 @@ its surprisingly good",
'html' => "<p>Now playing</p><pre><code>echo &quot;main(i){for(i=0;;i++)putchar(((i*(i&gt;&gt;8|i&gt;&gt;9)&amp;46&amp;i&gt;&gt;8))^(i&amp;i&gt;&gt;13|i&gt;&gt;6));}&quot; | gcc -o a.out -x c - 2&gt; /dev/null 'html' => "<p>Now playing</p><pre><code>echo &quot;main(i){for(i=0;;i++)putchar(((i*(i&gt;&gt;8|i&gt;&gt;9)&amp;46&amp;i&gt;&gt;8))^(i&amp;i&gt;&gt;13|i&gt;&gt;6));}&quot; | gcc -o a.out -x c - 2&gt; /dev/null
./a.out | aplay -q 2&gt; /dev/null</code></pre><p>its surprisingly good</p>", ./a.out | aplay -q 2&gt; /dev/null</code></pre><p>its surprisingly good</p>",
], ],
'bug-11851-content-0' => [
'expectedBBCode' => '[url=https://dev-friendica.mrpetovan.com/profile/hypolite]@hypolite[/url] 0',
'html' => '<p><span class="h-card"><a href="https://dev-friendica.mrpetovan.com/profile/hypolite" class="u-url mention">@<span>hypolite</span></a></span> 0</p>',
],
]; ];
} }