mikuli.cz

commit 06c1e2f478f1adeacfb52fa679df6b886fbd2a53
parent 53c8f25dd8aebb6d330b2e14542651e111299717
Author: markseu <mark2011@mayberg.se>
Date:   Sat, 13 Mar 2021 18:56:13 +0100

Refactored parser for Giovanni

Diffstat:
M
system/extensions/core.php
 | 
3
+--
M
system/extensions/markdown.php
 | 
6
++++--
M
system/extensions/update-current.ini
 | 
8
++++----

3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/system/extensions/core.php b/system/extensions/core.php
@@ -2,7 +2,7 @@
 // Core extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/core
 
 class YellowCore {
-    const VERSION = "0.8.40";
+    const VERSION = "0.8.41";
     const RELEASE = "0.8.16";
     public $page;           // current page
     public $content;        // content files
@@ -554,7 +554,6 @@ class YellowPage {
                     $this->parserData = preg_replace("/@pageRead/i", $this->get("pageRead"), $this->parserData);
                     $this->parserData = preg_replace("/@pageEdit/i", $this->get("pageEdit"), $this->parserData);
                     $this->parserData = $this->parser->onParseContentRaw($this, $this->parserData);
-                    $this->parserData = $this->yellow->toolbox->normaliseData($this->parserData, "html");
                     foreach ($this->yellow->extension->data as $key=>$value) {
                         if (method_exists($value["object"], "onParseContentHtml")) {
                             $output = $value["object"]->onParseContentHtml($this, $this->parserData);
diff --git a/system/extensions/markdown.php b/system/extensions/markdown.php
@@ -2,7 +2,7 @@
 // Markdown extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/markdown
 
 class YellowMarkdown {
-    const VERSION = "0.8.16";
+    const VERSION = "0.8.17";
     public $yellow;         // access to API
     
     // Handle initialisation
@@ -13,7 +13,9 @@ class YellowMarkdown {
     // Handle page content in raw format
     public function onParseContentRaw($page, $text) {
         $markdown = new YellowMarkdownParser($this->yellow, $page);
-        return $markdown->transform($text);
+        $text = $markdown->transform($text);
+        $text = $this->yellow->toolbox->normaliseData($text, "html");
+        return $text;
     }
 }
 
diff --git a/system/extensions/update-current.ini b/system/extensions/update-current.ini
@@ -21,11 +21,11 @@ Tag: feature
 system/extensions/command.php: command.php, create, update
 
 Extension: Core
-Version: 0.8.40
+Version: 0.8.41
 Description: Core functionality of the website.
 HelpUrl: https://github.com/datenstrom/yellow-extensions/tree/master/source/core
 DownloadUrl: https://github.com/datenstrom/yellow-extensions/raw/master/zip/core.zip
-Published: 2021-01-19 11:13:22
+Published: 2021-03-13 18:27:18
 Developer: Datenstrom
 Tag: feature
 system/extensions/core.php: core.php, create, update
@@ -54,11 +54,11 @@ Tag: feature
 system/extensions/image.php: image.php, create, update
 
 Extension: Markdown
-Version: 0.8.16
+Version: 0.8.17
 Description: Text formatting for humans.
 HelpUrl: https://github.com/datenstrom/yellow-extensions/tree/master/source/markdown
 DownloadUrl: https://github.com/datenstrom/yellow-extensions/raw/master/zip/markdown.zip
-Published: 2020-10-13 13:21:30
+Published: 2021-03-13 18:49:28
 Developer: Datenstrom
 Tag: feature
 system/extensions/markdown.php: markdown.php, create, update