#3 add null question to parsedown-extra, stop escaping HTML

creecros · Mar 18, 2021 · bcff490 · bcff490
1 parent a313699
commit bcff490
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/Helper/MarkdownPlusHelper.php b/Helper/MarkdownPlusHelper.php
@@ -58,7 +58,7 @@ public function markdown($text, $isPublicLink = false)
     {
         $emoji = new Client(new Ruleset());
         $parsecheckbox = new CoreMarkdown($this->container, $isPublicLink);
-        $parsecheckbox->setMarkupEscaped(MARKDOWN_ESCAPE_HTML);
+        //$parsecheckbox->setMarkupEscaped(MARKDOWN_ESCAPE_HTML);
         if ($this->configModel->get('unicode_shortcode', '2') == 1) 
             return $emoji->shortnameToUnicode($parsecheckbox->text($text));
         else

diff --git a/vendor/erusev/parsedown-extra/ParsedownExtra.php b/vendor/erusev/parsedown-extra/ParsedownExtra.php
@@ -237,14 +237,15 @@ protected function blockMarkupComplete($Block)
     protected function blockSetextHeader($Line, array $Block = null)
     {
         $Block = parent::blockSetextHeader($Line, $Block);
-
-        if (preg_match('/[ ]*{('.$this->regexAttribute.'+)}[ ]*$/', $Block['element']['text'], $matches, PREG_OFFSET_CAPTURE))
-        {
-            $attributeString = $matches[1][0];
-
-            $Block['element']['attributes'] = $this->parseAttributeData($attributeString);
-
-            $Block['element']['text'] = substr($Block['element']['text'], 0, $matches[0][1]);
+        if (!is_null($Block)) {
+            if (preg_match('/[ ]*{('.$this->regexAttribute.'+)}[ ]*$/', $Block['element']['text'], $matches, PREG_OFFSET_CAPTURE))
+            {
+                $attributeString = $matches[1][0];
+
+                $Block['element']['attributes'] = $this->parseAttributeData($attributeString);
+
+                $Block['element']['text'] = substr($Block['element']['text'], 0, $matches[0][1]);
+            }
         }
 
         return $Block;