The "tagged with" message now works again.

diff --git a/include/conversation.php b/include/conversation.php
index 9d7b474af998b51fca9a49ef36e2f8ee06fda299..e74f4c33f0c1798d7d12762303da18f6a66edf82 100644 (file)
--- 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 ee40d186ce23a5d0578a790cec0e739b2068bf67..9f01ac59b08af0b0c4bd86fbfff7d6da7b9f62f2 100644 (file)
--- 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' : '');