Better handling of the network field in the item table.

[friendica.git] / object / Item.php

diff --git a/object/Item.php b/object/Item.php
index 781d21f9ca3347447333bd96e44c73a662c7c41e..9003c93c114bd44ee549f282e22099fa1471b59c 100644 (file)
--- a/object/Item.php
+++ b/object/Item.php
@@ -90,7 +90,7 @@ class Item extends BaseObject {
                 if (strcmp($item['created'], $item['edited'])<>0) {
                       $edited = array(
                           'label' => t('This entry was edited'),
-                          'date' => datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r'),,
+                          'date' => datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r'),
                           'relative' => relative_date($item['edited'])
                       );
                 }
@@ -158,23 +158,6 @@ 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));
-
-               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);
@@ -239,7 +222,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 = "";
@@ -289,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' : ''),
@@ -339,7 +322,9 @@ class Item extends BaseObject {
                        'wait' => t('Please wait'),
                        'thread_level' => $thread_level,
                         'postopts' => $langstr,
-                        'edited' => $edited
+                        'edited' => $edited,
+                       'network' => $item["item_network"],
+                       'network_name' => network_to_name($item['item_network']),
                );
 
                $arr = array('item' => $item, 'output' => $tmp_item);
@@ -527,7 +512,7 @@ class Item extends BaseObject {
         */
        public function get_data_value($name) {
                if(!isset($this->data[$name])) {
-                       logger('[ERROR] Item::get_data_value : Item has no value name "'. $name .'".', LOGGER_DEBUG);
+//                     logger('[ERROR] Item::get_data_value : Item has no value name "'. $name .'".', LOGGER_DEBUG);
                        return false;
                }