Merge pull request #6556 from MrPetovan/bug/6554-fix-hashtag-in-code

Bug/fix hashtag in code

mod/babel.php

@@ -72,6 +72,21 @@ function babel_content()
 					'title' => L10n::t('BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode'),
 					'content' => visible_whitespace($bbcode4)
 				];
+
+				$item = [
+					'body' => $bbcode,
+					'tag' => '',
+				];
+
+				\Friendica\Model\Item::setHashtags($item);
+				$results[] = [
+					'title' => L10n::t('Item Body'),
+					'content' => visible_whitespace($item['body'])
+				];
+				$results[] = [
+					'title' => L10n::t('Item Tags'),
+					'content' => $item['tag']
+				];
 				break;
 			case 'markdown':
 				$markdown = trim($_REQUEST['text']);

src/Content/Text/BBCode.php

@@ -1743,7 +1743,7 @@ class BBCode extends BaseObject
 
 		// Clean up the HTML by loading and saving the HTML with the DOM.
 		// Bad structured html can break a whole page.
-		// For performance reasons do it only with ativated item cache or at export.
+		// For performance reasons do it only with activated item cache or at export.
 		if (!$try_oembed || (get_itemcachepath() != "")) {
 			$doc = new DOMDocument();
 			$doc->preserveWhiteSpace = false;
@@ -1959,7 +1959,7 @@ class BBCode extends BaseObject
         $string = preg_replace('/#\[url\=([^\[\]]*)\](.*?)\[\/url\]/ism', '#$2', $string);
 
         // ignore anything in a code block
-        $string = preg_replace('/\[code\](.*?)\[\/code\]/sm', '', $string);
+        $string = preg_replace('/\[code.*?\].*?\[\/code\]/sm', '', $string);
 
         // Force line feeds at bbtags
         $string = str_replace(['[', ']'], ["\n[", "]\n"], $string);

src/Model/Item.php

@@ -2386,18 +2386,6 @@ class Item extends BaseObject
 
 	public static function setHashtags(&$item)
 	{
-
-		// 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"]);
-		
 		$tags = BBCode::getTags($item["body"]);
 
 		// No hashtags?
@@ -2405,6 +2393,17 @@ class Item extends BaseObject
 			return false;
 		}
 
+		// 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" . $match[1] . "]" . str_replace($find, $replace, $match[2]) . "[/code]");
+			}, $item["body"]);
+
 		// This sorting is important when there are hashtags that are part of other hashtags
 		// Otherwise there could be problems with hashtags like #test and #test2
 		rsort($tags);
@@ -2463,12 +2462,12 @@ class Item extends BaseObject
 
 		// Remember! What happens in [code], stays in [code]
 		// roleback the # and [
-		$item["body"] = preg_replace_callback("/\[code(.*)\](.*?)\[\/code\]/ism",
+		$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]");
+				return ("[code" . $match[1] . "]" . str_replace($find, $replace, $match[2]) . "[/code]");
 			}, $item["body"]);
 	}