BBcode, Tags - changes for #pullrequestreview-197771905

diff --git a/src/Model/Item.php b/src/Model/Item.php
index c5b952a660d71d8a478fc7892ce9eb2ab1af4db3..c08eb861cc85388a68b7e2c07fa82c6f1a0a2e65 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -2441,22 +2441,20 @@ class Item extends BaseObject
                                "#$2", $item["body"]);
 
                foreach ($tags as $tag) {
-                       if ((strpos($tag, '#') !== 0) || strpos($tag, '[url=')) {
+                       if ((strpos($tag, '#') !== 0) || strpos($tag, '[url=') || $tag[1] == '#') {
                                continue;
                        }
 
                        $basetag = str_replace('_',' ',substr($tag,1));
-                       if($basetag[0] != '#') { 
-                               $newtag = '#[url=' . System::baseUrl() . '/search?tag=' . $basetag . ']' . $basetag . '[/url]';
+                       $newtag = '#[url=' . System::baseUrl() . '/search?tag=' . $basetag . ']' . $basetag . '[/url]';
 
-                               $item["body"] = str_replace($tag, $newtag, $item["body"]);
+                       $item["body"] = str_replace($tag, $newtag, $item["body"]);
 
-                               if (!stristr($item["tag"], "/search?tag=" . $basetag . "]" . $basetag . "[/url]")) {
-                                       if (strlen($item["tag"])) {
-                                               $item["tag"] = ',' . $item["tag"];
-                                       }
-                                       $item["tag"] = $newtag . $item["tag"];
+                       if (!stristr($item["tag"], "/search?tag=" . $basetag . "]" . $basetag . "[/url]")) {
+                               if (strlen($item["tag"])) {
+                                       $item["tag"] = ',' . $item["tag"];
                                }
+                               $item["tag"] = $newtag . $item["tag"];
                        }
                }