Merge pull request #646 from annando/master

[friendica.git] / object / Item.php

diff --git a/object/Item.php b/object/Item.php
index 06b3683c6a494753e30dfde75c8f4057dc43155d..575a28f58fdfcd63c16fc6d7d1f7d20d83897bfd 100644 (file)
--- a/object/Item.php
+++ b/object/Item.php
@@ -158,22 +158,24 @@ class Item extends BaseObject {
                $hashtags = array();
                $mentions = array();
 
-               $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));
+               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) {
+                       foreach($taglist as $tag) {
 
-                       if ($tag["url"] == "")
-                               $tag["url"] = $searchpath.strtolower($tag["term"]);
+                               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 = "@";
+                               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>";
                        }
-                       $tags[] = $prefix."<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
                }
 
                /*foreach(explode(',',$item['tag']) as $tag){
@@ -239,7 +241,7 @@ class Item extends BaseObject {
 
                localize_item($item);
 
-               if ($item["postopts"]) {
+               if ($item["postopts"] and !get_config("system", "suppress_language")) {
                        //$langdata = explode(";", $item["postopts"]);
                        //$langstr = substr($langdata[0], 5)." (".round($langdata[1]*100, 1)."%)";
                        $langstr = "";