From 2f3e727570d9b4168a3eb307a3f26e3f645fb38e Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 27 Dec 2019 01:35:15 +0000
Subject: [PATCH 1/2] Markdown: Escape some elements prior to sending them
 through Markdown

---
 markdown/markdown.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/markdown/markdown.php b/markdown/markdown.php
index a5358d0e..9bebf64f 100644
--- a/markdown/markdown.php
+++ b/markdown/markdown.php
@@ -49,5 +49,25 @@ function markdown_post_local_start(App $a, &$request) {
 		return;
 	}
 
+	// Elements that shouldn't be parsed
+	$elements = ['code', 'noparse', 'nobb', 'pre'];
+	foreach ($elements as $element) {
+		$request['body'] = preg_replace_callback("/\[" . $element . "\](.*?)\[\/" . $element . "\]/ism",
+					function ($match)  use ($element) {
+						return '[base64' . $element . ']' . base64_encode($match[1]) . '[/base64' . $element . ']';
+					},
+					$request['body']
+				);
+	}
+
 	$request['body'] = Markdown::toBBCode($request['body']);
+
+	foreach ($elements as $element) {
+		$request['body'] = preg_replace_callback("/\[base64" . $element . "\](.*?)\[\/base64" . $element . "\]/ism",
+					function ($match)  use ($element) {
+						return '[' . $element . ']' . base64_decode($match[1]) . '[/' . $element . ']';
+					},
+					$request['body']
+				);
+	}
 }

From 051771c4e28723208384db0b15f40905323e14ee Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 27 Dec 2019 06:09:09 +0000
Subject: [PATCH 2/2] Standards

---
 markdown/markdown.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/markdown/markdown.php b/markdown/markdown.php
index 9bebf64f..bd0e022c 100644
--- a/markdown/markdown.php
+++ b/markdown/markdown.php
@@ -53,21 +53,21 @@ function markdown_post_local_start(App $a, &$request) {
 	$elements = ['code', 'noparse', 'nobb', 'pre'];
 	foreach ($elements as $element) {
 		$request['body'] = preg_replace_callback("/\[" . $element . "\](.*?)\[\/" . $element . "\]/ism",
-					function ($match)  use ($element) {
-						return '[base64' . $element . ']' . base64_encode($match[1]) . '[/base64' . $element . ']';
-					},
-					$request['body']
-				);
+			function ($match)  use ($element) {
+				return '[base64' . $element . ']' . base64_encode($match[1]) . '[/base64' . $element . ']';
+			},
+			$request['body']
+		);
 	}
 
 	$request['body'] = Markdown::toBBCode($request['body']);
 
-	foreach ($elements as $element) {
+	foreach (array_reverse($elements) as $element) {
 		$request['body'] = preg_replace_callback("/\[base64" . $element . "\](.*?)\[\/base64" . $element . "\]/ism",
-					function ($match)  use ($element) {
-						return '[' . $element . ']' . base64_decode($match[1]) . '[/' . $element . ']';
-					},
-					$request['body']
-				);
+			function ($match)  use ($element) {
+				return '[' . $element . ']' . base64_decode($match[1]) . '[/' . $element . ']';
+			},
+			$request['body']
+		);
 	}
 }