diff --git a/CHANGELOG.md b/CHANGELOG.md index b351e5ad0..4234dac5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.6.15 +## mm/dd/2019 + +1. [](#bugfix) + * Fixed broken markdown Twig tag [#2635](https://github.com/getgrav/grav/issues/2635) + # v1.6.14 ## 08/18/2019 diff --git a/system/src/Grav/Common/Twig/Node/TwigNodeMarkdown.php b/system/src/Grav/Common/Twig/Node/TwigNodeMarkdown.php index 4d238da8d..7bb2bfc7a 100644 --- a/system/src/Grav/Common/Twig/Node/TwigNodeMarkdown.php +++ b/system/src/Grav/Common/Twig/Node/TwigNodeMarkdown.php @@ -41,6 +41,6 @@ class TwigNodeMarkdown extends Node implements NodeOutputInterface ->write('$lines = explode("\n", $content);' . PHP_EOL) ->write('$content = preg_replace(\'/^\' . $matches[0]. \'/\', "", $lines);' . PHP_EOL) ->write('$content = join("\n", $content);' . PHP_EOL) - ->write('echo $this->env->getExtension(\'Grav\Common\Twig\TwigExtension\')->markdownFunction($content);' . PHP_EOL); + ->write('echo $this->env->getExtension(\'Grav\Common\Twig\TwigExtension\')->markdownFunction($context, $content);' . PHP_EOL); } } diff --git a/system/src/Grav/Common/Twig/TwigExtension.php b/system/src/Grav/Common/Twig/TwigExtension.php index cf24f7643..f84923ebd 100644 --- a/system/src/Grav/Common/Twig/TwigExtension.php +++ b/system/src/Grav/Common/Twig/TwigExtension.php @@ -613,10 +613,11 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn /** * @param string $string * + * @param array $context * @param bool $block Block or Line processing * @return mixed|string */ - public function markdownFunction($context = false, $string, $block = true) + public function markdownFunction($context, $string, $block = true) { $page = $context['page'] ?? null; return Utils::processMarkdown($string, $block, $page);