From c311471b17ebf2f28865db84e40cd12faba40655 Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Mon, 16 Oct 2023 11:45:08 +0800
Subject: [PATCH 1/2] Use temporary rewriting of curly brackets when rendering
 MD content

Fixes https://github.com/wintercms/winter/issues/992
---
 modules/cms/classes/Content.php | 44 ++++++++++++++++++++++++++++++---
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/modules/cms/classes/Content.php b/modules/cms/classes/Content.php
index 41d3a845e7..be1a0db07a 100644
--- a/modules/cms/classes/Content.php
+++ b/modules/cms/classes/Content.php
@@ -1,7 +1,9 @@
-<?php namespace Cms\Classes;
+<?php
 
-use File;
-use Markdown;
+namespace Cms\Classes;
+
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Facades\Markdown;
 
 /**
  * The CMS content file class.
@@ -62,7 +64,7 @@ public function parseMarkup()
                 $result = htmlspecialchars($this->markup);
                 break;
             case 'md':
-                $result = Markdown::parse($this->markup);
+                $result = $this->parseMarkdownMarkup($this->markup);
                 break;
             default:
                 $result = $this->markup;
@@ -70,4 +72,38 @@ public function parseMarkup()
 
         return $result;
     }
+
+    /**
+     * Parse Markdown content files.
+     *
+     * This method replaces curly variables in the content temporarily while Markdown rendering takes place, to
+     * circumvent the escaping that Commonmark does on curly brackets in links.
+     *
+     * @param string $markup
+     * @return string
+     */
+    protected function parseMarkdownMarkup(string $markup): string
+    {
+        /**
+         * Replace variables temporarily for Markdown parsing, as the Commonmark library escapes curly brackets in
+         * links.
+         * @see https://github.com/wintercms/winter/issues/992
+         */
+        $variables = [];
+        $markup = preg_replace_callback('/\{([^\n \}]+)\}/', function (array $matches) use (&$variables) {
+            $signature = hash('sha256', $matches[1]);
+            if (!array_key_exists($signature, $variables)) {
+                $variables[$signature] = $matches[1];
+            }
+            return ".=VAR={$signature}=.";
+        }, $markup);
+
+        $markup = Markdown::parse($markup);
+
+        foreach ($variables as $signature => $variable) {
+            $markup = str_replace(".=VAR={$signature}=.", "{{$variable}}", $markup);
+        }
+
+        return $markup;
+    }
 }

From 1f8ad3cd4aba0d02618a52aec5fcda820c2d20a8 Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Wed, 18 Oct 2023 09:54:25 +0800
Subject: [PATCH 2/2] Update modules/cms/classes/Content.php

Co-authored-by: Luke Towers <luke@luketowers.ca>
---
 modules/cms/classes/Content.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/cms/classes/Content.php b/modules/cms/classes/Content.php
index be1a0db07a..5e0f507cfa 100644
--- a/modules/cms/classes/Content.php
+++ b/modules/cms/classes/Content.php
@@ -78,9 +78,6 @@ public function parseMarkup()
      *
      * This method replaces curly variables in the content temporarily while Markdown rendering takes place, to
      * circumvent the escaping that Commonmark does on curly brackets in links.
-     *
-     * @param string $markup
-     * @return string
      */
     protected function parseMarkdownMarkup(string $markup): string
     {