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

Merge pull request #8801 from MrPetovan/task/8800-pre-whitespaces 

[pre] blocks now preserve spaces
This commit is contained in:
Tobias Diekershoff 2020-06-23 17:01:44 +02:00 committed by GitHub
parent 4e5c3157fe faeffff8a3
commit 2fc0b23b7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/BBCode.md
View File

@ -633,6 +633,14 @@ On Mastodon this field is used for the content warning.
</td> </td>
<td>@user@domain.tld #hashtag</td> <td>@user@domain.tld #hashtag</td>
</tr> </tr>
<tr>
<td>Additionally, [pre] blocks preserve spaces:
<ul>
<li>[pre]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Spaces[/pre]</li>
</ul>
</td>
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Spaces</td>
</tr>
<tr> <tr>
<td>[nosmile] is used to disable smilies on a post by post basis<br> <td>[nosmile] is used to disable smilies on a post by post basis<br>
<br> <br>

12
src/Content/Text/BBCode.php
View File

@ -1299,9 +1299,9 @@ class BBCode
// Remove the abstract element. It is a non visible element. // Remove the abstract element. It is a non visible element.
$text = self::stripAbstract($text); $text = self::stripAbstract($text);
// Move all spaces out of the tags // Move new lines outside of tags
$text = preg_replace("/\[(\w*)\](\s*)/ism", '$2[$1]', $text); $text = preg_replace("#\[(\w*)](\n*)#ism", '$2[$1]', $text);
$text = preg_replace("/(\s*)\[\/(\w*)\]/ism", '[/$2]$1', $text); $text = preg_replace("#(\n*)\[/(\w*)]#ism", '[/$2]$1', $text);
// Extract the private images which use data urls since preg has issues with // Extract the private images which use data urls since preg has issues with
// large data sizes. Stash them away while we do bbcode conversion, and then put them back // large data sizes. Stash them away while we do bbcode conversion, and then put them back
@ -1878,7 +1878,11 @@ class BBCode
// Remove escaping tags // Remove escaping tags
$text = preg_replace("/\[noparse\](.*?)\[\/noparse\]/ism", '\1', $text); $text = preg_replace("/\[noparse\](.*?)\[\/noparse\]/ism", '\1', $text);
$text = preg_replace("/\[nobb\](.*?)\[\/nobb\]/ism", '\1', $text); $text = preg_replace("/\[nobb\](.*?)\[\/nobb\]/ism", '\1', $text);
$text = preg_replace("/\[pre\](.*?)\[\/pre\]/ism", '\1', $text);
// Additionally, [pre] tags preserve spaces
$text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", function ($match) {
return str_replace(' ', '&nbsp;', $match[1]);
}, $text);
return $text; return $text;
}); // Escaped code }); // Escaped code

10
tests/src/Content/Text/BBCodeTest.php
View File

@ -236,7 +236,15 @@ class BBCodeTest extends MockedTest
'bug-7808-code-amp' => [ 'bug-7808-code-amp' => [
'expectedHtml' => '<code>&amp;</code>', 'expectedHtml' => '<code>&amp;</code>',
'text' => '[code]&[/code]', 'text' => '[code]&[/code]',
] ],
'task-8800-pre-spaces-notag' => [
'expectedHtml' => '[test] Space',
'text' => '[test] Space',
],
'task-8800-pre-spaces' => [
'expectedHtml' => '&nbsp;&nbsp;&nbsp;&nbsp;Spaces',
'text' => '[pre] Spaces[/pre]',
],
]; ];
} }