From c02b1c3f36a19bb5e4fb27e2edd9c4c45a8a7b4c Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sat, 3 Sep 2016 12:48:51 +0200
Subject: [PATCH] The "tagged with" message now works again.

---
 include/conversation.php |  2 +-
 object/Item.php          | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index 9d7b474af9..e74f4c33f0 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -425,7 +425,7 @@ These Fields are not added below (yet). They are here to for bug search.
 		`item`.`guid`, `item`.`wall`, `item`.`private`, `item`.`starred`,
 		`item`.`title`,	`item`.`body`, `item`.`file`, `item`.`event-id`,
 		`item`.`location`, `item`.`coord`, `item`.`app`,
-		`item`.`rendered-hash`, `item`.`rendered-html`,
+		`item`.`rendered-hash`, `item`.`rendered-html`, `item`.`object`,
 		`item`.`allow_cid`, `item`.`allow_gid`, `item`.`deny_cid`, `item`.`deny_gid`,
 		`item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
 
diff --git a/object/Item.php b/object/Item.php
index ee40d186ce..9f01ac59b0 100644
--- a/object/Item.php
+++ b/object/Item.php
@@ -89,14 +89,14 @@ class Item extends BaseObject {
 		$a = $this->get_app();
 
 		$item = $this->get_data();
-                $edited = false;
-                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'),
-                          'relative' => relative_date($item['edited'])
-                      );
-                }
+		$edited = false;
+		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'),
+			  'relative' => relative_date($item['edited'])
+		      );
+		}
 		$commentww = '';
 		$sparkle = '';
 		$buttons = '';
@@ -439,10 +439,10 @@ class Item extends BaseObject {
 			}
 		}
 
-        if ($this->is_toplevel()) {
-            $result['total_comments_num'] = "$total_children";
-            $result['total_comments_text'] = tt('comment', 'comments', $total_children);
-        }
+	if ($this->is_toplevel()) {
+	    $result['total_comments_num'] = "$total_children";
+	    $result['total_comments_text'] = tt('comment', 'comments', $total_children);
+	}
 
 		$result['private'] = $item['private'];
 		$result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : '');
-- 
2.39.5