Merge pull request #646 from annando/master

[friendica.git] / object / Item.php

diff --git a/object/Item.php b/object/Item.php
index de28da464239e37b61bbbab816f80209cd9842af..575a28f58fdfcd63c16fc6d7d1f7d20d83897bfd 100644 (file)
--- a/object/Item.php
+++ b/object/Item.php
@@ -66,6 +66,7 @@ class Item extends BaseObject {
                                if(! visible_activity($item)) {
                                        continue;
                                }
+                               $item['pagedrop'] = $data['pagedrop'];
                                $child = new Item($item);
                                $this->add_child($child);
                        }
@@ -85,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 = '';
@@ -150,22 +158,24 @@ 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));
+               if (!get_config('system','suppress_tags')) {
+                       $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) {
+                       foreach($taglist as $tag) {
 
-                       if ($tag["url"] == "")
-                               $tag["url"] = $searchpath.strtolower($tag["term"]);
+                               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 = "@";
+                               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>";
                        }
-                       $tags[] = $prefix."<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
                }
 
                /*foreach(explode(',',$item['tag']) as $tag){
@@ -189,10 +199,10 @@ class Item extends BaseObject {
                 * Maybe we should establish a way to be notified about conversation changes
                 */
                $this->check_wall_to_wall();
-               
+
                if($this->is_wall_to_wall() && ($this->get_owner_url() == $this->get_redirect_url()))
                        $osparkle = ' sparkle';
-               
+
                if($this->is_toplevel()) {
                        if($conv->get_profile_owner() == local_user()) {
                                $isstarred = (($item['starred']) ? "starred" : "unstarred");
@@ -231,7 +241,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 = "";
@@ -282,14 +292,14 @@ class Item extends BaseObject {
 
                        'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
                        'tags' => $tags,
-            'hashtags' => $hashtags,
-            'mentions' => $mentions,
+                       'hashtags' => $hashtags,
+                       'mentions' => $mentions,
                        'txt_cats' => t('Categories:'),
                        'txt_folders' => t('Filed under:'),
                        'has_cats' => ((count($categories)) ? 'true' : ''),
                        'has_folders' => ((count($folders)) ? 'true' : ''),
-            'categories' => $categories,
-            'folders' => $folders,
+                       'categories' => $categories,
+                       'folders' => $folders,
                        'body' => $body_e,
                        'text' => $text_e,
                        'id' => $this->get_id(),
@@ -324,13 +334,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);
@@ -360,12 +371,12 @@ class Item extends BaseObject {
                                }
                        }
                }
-               
+
         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' : '');
 
@@ -536,13 +547,7 @@ class Item extends BaseObject {
                        return false;
                }
 
-               if($a->theme['template_engine'] === 'smarty3') {
-                       $template_file = get_template_file($a, 'smarty3/' . $this->available_templates[$name]);
-               }
-               else {
-                       $template_file = $this->available_templates[$name];
-               }
-               $this->template = $template_file;
+               $this->template = $this->available_templates[$name];
        }
 
        /**
@@ -632,7 +637,7 @@ class Item extends BaseObject {
                                $qcomment = (($qc) ? explode("\n",$qc) : null);
                        }
                        $comment_box = replace_macros($template,array(
-                               '$return_path' => '',
+                               '$return_path' => $a->query_string,
                                '$threaded' => $this->is_threaded(),
 //                             '$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''),
                                '$jsreload' => '',