friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #5912 from MrPetovan/bug/fix-code-tag-nonsense 

Fix [code] tag whitespace nonsense
This commit is contained in:
Michael Vogel 2018-10-14 20:00:19 +02:00 committed by GitHub
parent 59d6dd809d f7c020af04
commit 68af56a10e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mod/babel.php
View File

@ -114,6 +114,17 @@ function babel_content()
'content' => visible_whitespace($bbcode)
];
$html2 = Text\BBCode::convert($bbcode);
$results[] = [
'title' => L10n::t('HTML::toBBCode => BBCode::convert'),
'content' => $html2
];
$results[] = [
'title' => L10n::t('HTML::toBBCode => BBCode::convert (raw HTML)'),
'content' => htmlspecialchars($html2)
];
$markdown = Text\HTML::toMarkdown($html);
$results[] = [
'title' => L10n::t('HTML::toMarkdown'),

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

@ -1265,9 +1265,6 @@ class BBCode extends BaseObject
$text = preg_replace("/\s?\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "[share$1]$2[/share]", $text);
$text = preg_replace("/\s?\[quote(.*?)\]\s?(.*?)\s?\[\/quote\]\s?/ism", "[quote$1]$2[/quote]", $text);
$text = preg_replace("/\n\[code\]/ism", "[code]", $text);
$text = preg_replace("/\[\/code\]\n/ism", "[/code]", $text);
// when the content is meant exporting to other systems then remove the avatar picture since this doesn't really look good on these systems
if (!$try_oembed) {
$text = preg_replace("/\[share(.*?)avatar\s?=\s?'.*?'\s?(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "\n[share$1$2]$3[/share]", $text);
@ -1717,18 +1714,6 @@ class BBCode extends BaseObject
$text = Smilies::replace($text, false, true);
}
// Replace inline code blocks
$text = preg_replace_callback("|(?!<br[^>]*>)<code>([^<]*)</code>(?!<br[^>]*>)|ism",
function ($match) use ($simple_html) {
$return = '<key>' . $match[1] . '</key>';
// Use <code> for Diaspora inline code blocks
if ($simple_html === 3) {
$return = '<code>' . $match[1] . '</code>';
}
return $return;
}
, $text);
// Unhide all [noparse] contained bbtags unspacefying them
// and triming the [noparse] tag.