From 80328308731a6a85a1553cdce5c9a2787bd0a00d Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Sat, 4 Mar 2017 13:28:43 -0700 Subject: [PATCH] Added block/line option to process markdown --- CHANGELOG.md | 1 + system/src/Grav/Common/Twig/TwigExtension.php | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 620be3db5..4feb2da40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ 1. [](#new) * Added default setting to only allow `direct-installs` from official GPM. Can be configured in `system.yaml` * Added a new `Utils::isValidUrl()` method + * Added optional parameter to `|markdown(false)` filter to toggle block/line processing (default|true = `block`) 1. [](#improved) * Genericized `direct-install` so it can be called via Admin plugin 1. [](#bugfix) diff --git a/system/src/Grav/Common/Twig/TwigExtension.php b/system/src/Grav/Common/Twig/TwigExtension.php index fff032e9c..eb6b960ad 100644 --- a/system/src/Grav/Common/Twig/TwigExtension.php +++ b/system/src/Grav/Common/Twig/TwigExtension.php @@ -432,9 +432,10 @@ class TwigExtension extends \Twig_Extension /** * @param $string * + * @param bool $block Block or Line processing * @return mixed|string */ - public function markdownFilter($string) + public function markdownFilter($string, $block = true) { $page = $this->grav['page']; $defaults = $this->config->get('system.pages.markdown'); @@ -446,7 +447,12 @@ class TwigExtension extends \Twig_Extension $parsedown = new Parsedown($page, $defaults); } - $string = $parsedown->text($string); + if ($block) { + $string = $parsedown->text($string); + } else { + $string = $parsedown->line($string); + } + return $string; }