strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add inline spans to code block extraction in BBCode::convert

Browse source 
- Fixes autolinker replacing URLs inside of code spans
This commit is contained in:
Hypolite Petovan 2019-03-14 09:03:31 -04:00 committed by GitHub
parent 140391fff1
commit ee4585ec71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Content/Text/BBCode.php
View file

@ -1180,17 +1180,18 @@ class BBCode extends BaseObject
return $return; return $return;
}; };
// Extracting multi-line code blocks before the whitespace processing // Extracting code blocks before the whitespace processing and the autolinker
$codeblocks = []; $codeblocks = [];
$text = preg_replace_callback("#\[code(?:=([^\]]*))?\](.*?)\[\/code\]#ism", $text = preg_replace_callback("#\[code(?:=([^\]]*))?\](.*?)\[\/code\]#ism",
function ($matches) use (&$codeblocks) { function ($matches) use (&$codeblocks) {
$return = $matches[0]; $return = '#codeblock-' . count($codeblocks) . '#';
if (strpos($matches[2], "\n") !== false) { if (strpos($matches[2], "\n") !== false) {
$return = '#codeblock-' . count($codeblocks) . '#'; $codeblocks[] = '<pre><code class="language-' . trim($matches[1]) . '">' . trim($matches[2], "\n\r") . '</code></pre>';
} else {
$codeblocks[] = '<pre><code class="language-' . trim($matches[1]) . '">' . trim($matches[2], "\n\r") . '</code></pre>'; $codeblocks[] = '<code>' . $matches[2] . '</code>';
} }
return $return; return $return;
}, },
$text $text
@ -1502,12 +1503,6 @@ class BBCode extends BaseObject
// Check for font change text // Check for font change text
$text = preg_replace("/\[font=(.*?)\](.*?)\[\/font\]/sm", "<span style=\"font-family: $1;\">$2</span>", $text); $text = preg_replace("/\[font=(.*?)\](.*?)\[\/font\]/sm", "<span style=\"font-family: $1;\">$2</span>", $text);
// Declare the format for [code] layout
$CodeLayout = '<code>$1</code>';
// Check for [code] text
$text = preg_replace("/\[code\](.*?)\[\/code\]/ism", "$CodeLayout", $text);
// Declare the format for [spoiler] layout // Declare the format for [spoiler] layout
$SpoilerLayout = '<blockquote class="spoiler">$1</blockquote>'; $SpoilerLayout = '<blockquote class="spoiler">$1</blockquote>';