Merge remote-tracking branch 'upstream/master'

diff --combined object/Item.php
index fef928c289e63625febe34ca09ad0a5c479cac3f,06b3683c6a494753e30dfde75c8f4057dc43155d..75656a76f74f426cf7e4e4869c0b18cef976555f
--- 1/object/Item.php
--- 2/object/Item.php
+++ b/object/Item.php
@@@ -86,7 -86,14 +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 = '';
@@@ -232,7 -239,7 +239,7 @@@
  
                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 = "";
@@@ -325,13 -332,14 +332,14 @@@
                        '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);