Merge remote-tracking branch 'upstream/master'

[friendica.git] / object / Item.php

diff --git a/object/Item.php b/object/Item.php
index fef928c289e63625febe34ca09ad0a5c479cac3f..75656a76f74f426cf7e4e4869c0b18cef976555f 100644 (file)
--- a/object/Item.php
+++ b/object/Item.php
@@ -86,7 +86,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'])
+                      );
+                }
                $commentww = '';
                $sparkle = '';
                $buttons = '';
@@ -325,13 +332,14 @@ class Item extends BaseObject {
                        'drop' => $drop,
                        'vote' => $buttons,
                        'like' => $like,
-                       'dislike'   => $dislike,
+                        'dislike'   => $dislike,
                        'switchcomment' => t('Comment'),
                        'comment' => $this->get_comment_box($indent),
                        'previewing' => ($conv->is_preview() ? ' preview ' : ''),
                        'wait' => t('Please wait'),
                        'thread_level' => $thread_level,
-                       'postopts' => $langstr
+                        'postopts' => $langstr,
+                        'edited' => $edited
                );
 
                $arr = array('item' => $item, 'output' => $tmp_item);