Merge remote-tracking branch 'upstream/master'

[friendica.git] / object / Item.php

diff --git a/object/Item.php b/object/Item.php
index ae4d26cc1073a56c7524dea931d3a3920a8f411c..0a793e5f32521b4f27c1720b2400922617523dcb 100644 (file)
--- a/object/Item.php
+++ b/object/Item.php
@@ -158,25 +158,6 @@ class Item extends BaseObject {
                $hashtags = array();
                $mentions = array();
 
-               if (!get_config('system','suppress_tags')) {
-                       $taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`",
-                                       intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION));
-
-                       foreach($taglist as $tag) {
-
-                               if ($tag["url"] == "")
-                                       $tag["url"] = $searchpath.strtolower($tag["term"]);
-
-                               if ($tag["type"] == TERM_HASHTAG) {
-                                       $hashtags[] = "#<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
-                                       $prefix = "#";
-                               } elseif ($tag["type"] == TERM_MENTION) {
-                                       $mentions[] = "@<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
-                                       $prefix = "@";
-                               }
-                               $tags[] = $prefix."<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
-                       }
-               }
 
                /*foreach(explode(',',$item['tag']) as $tag){
                        $tag = trim($tag);
@@ -291,9 +272,9 @@ class Item extends BaseObject {
                        'template' => $this->get_template(),
 
                        'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
-                       'tags' => $tags,
-                       'hashtags' => $hashtags,
-                       'mentions' => $mentions,
+                       'tags' => $item['tags'],
+                       'hashtags' => $item['hashtags'],
+                       'mentions' => $item['mentions'],
                        'txt_cats' => t('Categories:'),
                        'txt_folders' => t('Filed under:'),
                        'has_cats' => ((count($categories)) ? 'true' : ''),