Skip to content

Commit e5cedd0

Browse files
committed
Fixed broken markdown Twig tag [getgrav#2635]
1 parent ed87faa commit e5cedd0

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# v1.6.15
2+
## mm/dd/2019
3+
4+
1. [](#bugfix)
5+
* Fixed broken markdown Twig tag [#2635](https://github.com/getgrav/grav/issues/2635)
6+
17
# v1.6.14
28
## 08/18/2019
39

system/src/Grav/Common/Twig/Node/TwigNodeMarkdown.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ public function compile(Compiler $compiler)
4141
->write('$lines = explode("\n", $content);' . PHP_EOL)
4242
->write('$content = preg_replace(\'/^\' . $matches[0]. \'/\', "", $lines);' . PHP_EOL)
4343
->write('$content = join("\n", $content);' . PHP_EOL)
44-
->write('echo $this->env->getExtension(\'Grav\Common\Twig\TwigExtension\')->markdownFunction($content);' . PHP_EOL);
44+
->write('echo $this->env->getExtension(\'Grav\Common\Twig\TwigExtension\')->markdownFunction($context, $content);' . PHP_EOL);
4545
}
4646
}

system/src/Grav/Common/Twig/TwigExtension.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,10 +613,11 @@ public function absoluteUrlFilter($string)
613613
/**
614614
* @param string $string
615615
*
616+
* @param array $context
616617
* @param bool $block Block or Line processing
617618
* @return mixed|string
618619
*/
619-
public function markdownFunction($context = false, $string, $block = true)
620+
public function markdownFunction($context, $string, $block = true)
620621
{
621622
$page = $context['page'] ?? null;
622623
return Utils::processMarkdown($string, $block, $page);

0 commit comments

Comments
 (0)