Merge pull request #582 from ArthurHoaro/hotfix/nomarkdown

The "nomarkdown" tag is no longer private

2 files changed, 20 insertions, 5 deletions

diff --git a/plugins/markdown/markdown.php b/plugins/markdown/markdown.php
index 57fcce32..5f56ecc2 100644
--- a/plugins/markdown/markdown.php
+++ b/plugins/markdown/markdown.php
@@ -10,9 +10,8 @@ require_once 'Parsedown.php';
 
 /*
  * If this tag is used on a shaare, the description won't be processed by Parsedown.
- * Using a private tag so it won't appear for visitors.
  */
-define('NO_MD_TAG', '.nomarkdown');
+define('NO_MD_TAG', 'nomarkdown');
 
 /**
  * Parse linklist descriptions.
@@ -25,11 +24,11 @@ function hook_markdown_render_linklist($data)
 {
     foreach ($data['links'] as &$value) {
         if (!empty($value['tags']) && noMarkdownTag($value['tags'])) {
+            $value['taglist'] = stripNoMarkdownTag($value['taglist']);
             continue;
         }
         $value['description'] = process_markdown($value['description']);
     }
-
     return $data;
 }
 
@@ -44,6 +43,7 @@ function hook_markdown_render_feed($data)
 {
     foreach ($data['links'] as &$value) {
         if (!empty($value['tags']) && noMarkdownTag($value['tags'])) {
+            $value['tags'] = stripNoMarkdownTag($value['tags']);
             continue;
         }
         $value['description'] = process_markdown($value['description']);
@@ -87,6 +87,19 @@ function noMarkdownTag($tags)
 }
 
 /**
+ * Remove the no-markdown meta tag so it won't be displayed.
+ *
+ * @param string $tags Tag list.
+ *
+ * @return string tag list without no markdown tag.
+ */
+function stripNoMarkdownTag($tags)
+{
+    unset($tags[array_search(NO_MD_TAG, $tags)]);
+    return array_values($tags);
+}
+
+/**
  * When link list is displayed, include markdown CSS.
  *
  * @param array $data includes data.
diff --git a/tests/plugins/PluginMarkdownTest.php b/tests/plugins/PluginMarkdownTest.php
index fa7e1d52..3593a556 100644
--- a/tests/plugins/PluginMarkdownTest.php
+++ b/tests/plugins/PluginMarkdownTest.php
@@ -125,7 +125,8 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase
         $data = array(
             'links' => array(array(
                 'description' => $str,
-                'tags' => NO_MD_TAG
+                'tags' => NO_MD_TAG,
+                'taglist' => array(NO_MD_TAG),
             ))
         );
 
@@ -140,7 +141,8 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase
                     // nth link
                     0 => array(
                         'formatedDescription' => $str,
-                        'tags' => NO_MD_TAG
+                        'tags' => NO_MD_TAG,
+                        'taglist' => array(),
                     ),
                 ),
             ),