bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

BBcode, Tags - fix BBCode created tags in [code] blocks, fix usage of multiple ## created tags

Browse source
This commit is contained in:
Peter Liebetrau 2019-01-29 21:17:11 +01:00
parent 431306b026
commit d8bd1921ee
2 changed files with 33 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1178,7 +1178,7 @@ class BBCode extends BaseObject
// Extracting multi-line code blocks before the whitespace processing // Extracting multi-line code blocks before the whitespace processing
$codeblocks = []; $codeblocks = [];
$text = preg_replace_callback("#\[code(?:=([^\]]*))?\](.*?)\[\/code\]#is", $text = preg_replace_callback("#\[code(?:=([^\]]*))?\](.*?)\[\/code\]#ism",
function ($matches) use (&$codeblocks) { function ($matches) use (&$codeblocks) {
$return = $matches[0]; $return = $matches[0];
if (strpos($matches[2], "\n") !== false) { if (strpos($matches[2], "\n") !== false) {

39
src/Model/Item.php
View file

@ -2400,6 +2400,17 @@ class Item extends BaseObject
$URLSearchString = "^\[\]"; $URLSearchString = "^\[\]";
// What happens in [code], stays in [code]!
// escape the # and the [
// hint: we will also get in trouble with #tags, when we want markdown in posts -> ### Headline 3
$item["body"] = preg_replace_callback("/\[code(.*)\](.*?)\[\/code\]/ism",
function ($match) {
// we truly ESCape all # and [ to prevent gettin weird tags in [code] blocks
$find = ['#', '['];
$replace = [chr(27).'sharp', chr(27).'leftsquarebracket'];
return ("[code" . str_replace($find, $replace, $match[1]) . "]" . $match[2] . "[/code]");
}, $item["body"]);
// All hashtags should point to the home server if "local_tags" is activated // All hashtags should point to the home server if "local_tags" is activated
if (Config::get('system', 'local_tags')) { if (Config::get('system', 'local_tags')) {
$item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
@ -2435,21 +2446,35 @@ class Item extends BaseObject
} }
$basetag = str_replace('_',' ',substr($tag,1)); $basetag = str_replace('_',' ',substr($tag,1));
if($basetag[0] != '#') {
$newtag = '#[url=' . System::baseUrl() . '/search?tag=' . $basetag . ']' . $basetag . '[/url]';
$newtag = '#[url=' . System::baseUrl() . '/search?tag=' . $basetag . ']' . $basetag . '[/url]'; $item["body"] = str_replace($tag, $newtag, $item["body"]);
$item["body"] = str_replace($tag, $newtag, $item["body"]); if (!stristr($item["tag"], "/search?tag=" . $basetag . "]" . $basetag . "[/url]")) {
if (strlen($item["tag"])) {
if (!stristr($item["tag"], "/search?tag=" . $basetag . "]" . $basetag . "[/url]")) { $item["tag"] = ',' . $item["tag"];
if (strlen($item["tag"])) { }
$item["tag"] = ',' . $item["tag"]; $item["tag"] = $newtag . $item["tag"];
} }
$item["tag"] = $newtag . $item["tag"];
} }
} }
// Convert back the masked hashtags // Convert back the masked hashtags
$item["body"] = str_replace("#", "#", $item["body"]); $item["body"] = str_replace("#", "#", $item["body"]);
// Remember! What happens in [code], stays in [code]
// roleback the # and [
$item["body"] = preg_replace_callback("/\[code(.*)\](.*?)\[\/code\]/ism",
function ($match) {
// we truly unESCape all sharp and leftsquarebracket
$find = [chr(27).'sharp', chr(27).'leftsquarebracket'];
$replace = ['#', '['];
return ("[code" . str_replace($find, $replace, $match[1]) . "]" . $match[2] . "[/code]");
}, $item["body"]);
// Convert back the masked hashtags
$item["body"] = str_replace("#", "#", $item["body"]);
} }
public static function getGuidById($id) public static function getGuidById($id)