DFRN: Mentions were imported as hash tags

diff --git a/include/dfrn.php b/include/dfrn.php
index ad04a91295da29f4932024a9efee0c3f4bf4b549..1c5ac2b012c8833a62f4c89bbca0c7690137d0ed 100644 (file)
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -2022,14 +2022,28 @@ class dfrn {
                $categories = $xpath->query("atom:category", $entry);
                if ($categories) {
                        foreach ($categories AS $category) {
-                               foreach($category->attributes AS $attributes)
-                                       if ($attributes->name == "term") {
+                               $term = "";
+                               $scheme = "";
+                               foreach($category->attributes AS $attributes) {
+                                       if ($attributes->name == "term")
                                                $term = $attributes->textContent;
+
+                                       if ($attributes->name == "scheme")
+                                               $scheme = $attributes->textContent;
+                               }
+
+                               if (($term != "") AND ($scheme != "")) {
+                                       $parts = explode(":", $scheme);
+                                       if ((count($parts) >= 4) AND (array_shift($parts) == "X-DFRN")) {
+                                               $termhash = array_shift($parts);
+                                               $termurl = implode(":", $parts);
+
                                                if(strlen($item["tag"]))
                                                        $item["tag"] .= ",";
 
-                                               $item["tag"] .= "#[url=".App::get_baseurl()."/search?tag=".$term."]".$term."[/url]";
+                                               $item["tag"] .= $termhash."[url=".$termurl."]".$term."[/url]";
                                        }
+                               }
                        }
                }