From c8c822bad22553de2ebb40faab979c0224b5dd81 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Tue, 10 Apr 2018 14:45:36 -0600 Subject: [PATCH 1/2] Fixes for parsedown 1.8.0 --- CHANGELOG.md | 6 ++++++ blueprints.yaml | 2 +- classes/ShortcodeManager.php | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9239d2..8f5c567 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v3.0.0 +## mm/dd/2018 + +1. [](#new) + * Parsedown 1.8.0 compatibility in Grav 1.4.3 + # v2.7.1 ## 03/14/2018 diff --git a/blueprints.yaml b/blueprints.yaml index a7927c7..9df861b 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -13,7 +13,7 @@ bugs: https://github.com/getgrav/grav-plugin-shortcode-core/issues license: MIT dependencies: - - { name: grav, version: '~1.1' } + - { name: grav, version: '>=1.4.3' } form: validation: strict diff --git a/classes/ShortcodeManager.php b/classes/ShortcodeManager.php index 142c53b..29e9347 100644 --- a/classes/ShortcodeManager.php +++ b/classes/ShortcodeManager.php @@ -200,9 +200,9 @@ public function setupMarkdown($markdown) $regex = '/^\[\/?(?:'.$valid_shortcodes.')[^\]]*\]$/'; if (preg_match($regex, $Line['body'], $matches)) { - $Block = array( - 'markup' => $Line['body'], - ); + $Block = ['element' => [ + 'rawHtml' => $Line['body'] + ]]; return $Block; } }; From cc52b3d025234e6a4bb3a56548b67f02fb8499b5 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Tue, 10 Apr 2018 15:11:00 -0600 Subject: [PATCH 2/2] pass new required attribute --- classes/ShortcodeManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/ShortcodeManager.php b/classes/ShortcodeManager.php index 29e9347..a44c891 100644 --- a/classes/ShortcodeManager.php +++ b/classes/ShortcodeManager.php @@ -193,7 +193,7 @@ public function registerAllShortcodes($directory) */ public function setupMarkdown($markdown) { - $markdown->addBlockType('[', 'ShortCodes', true, false); + $markdown->addBlockType('[', 'ShortCodes', true, false, null, true); $markdown->blockShortCodes = function($Line) { $valid_shortcodes = implode('|', $this->handlers->getNames());