Merge fix #545, fix invalid HTML when linking to URLs with numeric fragment identifiers and update Parsedown

2015-01-25 12:23:27 -05:00
parent e506648cbc
commit 0812ceedde
5 changed files with 62 additions and 27 deletions
--- a/app/Core/Markdown.php
+++ b/app/Core/Markdown.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Core;
+
+use Parsedown;
+
+/**
+ * Specific Markdown rules for Kanboard
+ *
+ * @package core
+ * @author  norcnorc
+ * @author  Frederic Guillot
+ */
+class Markdown extends Parsedown
+{
+    private $link;
+    private $helper;
+    
+    public function __construct($link, Helper $helper) 
+    {
+        $this->link = $link;
+        $this->helper = $helper;
+        $this->InlineTypes['#'][] = 'TaskLink';
+        $this->inlineMarkerList .= '#';
+    }
+
+    protected function inlineTaskLink($Excerpt)
+    {
+        // Replace task #123 by a link to the task
+        if (! empty($this->link) && preg_match('!#(\d+)!i', $Excerpt['text'], $matches)) {
+
+            $url = $this->helper->u($this->link['controller'],
+                                    $this->link['action'],
+                                    $this->link['params'] + array('task_id' => $matches[1]));
+            return array(
+                'extent' => strlen($matches[0]),
+                'element' => array(
+                    'name' => 'a',
+                    'text' => $matches[0],
+                    'attributes' => array('href' => $url)));
+        }
+    }
+}