Merge pull request #3904 from annando/worker-space2

[friendica.git] / object / Item.php

diff --git a/object/Item.php b/object/Item.php
index ebb53b47a7d4bb3998ff016189748bb09b3d94ed..80bbf255dd8eae6a7b43efc95775ea13e359941d 100644 (file)
--- a/object/Item.php
+++ b/object/Item.php
@@ -2,9 +2,13 @@
 if(class_exists('Item'))
        return;
 
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
+use Friendica\Protocol\Diaspora;
+
 require_once('object/BaseObject.php');
 require_once('include/text.php');
-require_once('include/diaspora.php');
 require_once('boot.php');
 
 /**
@@ -52,7 +56,7 @@ class Item extends BaseObject {
                $ssl_state = ((local_user()) ? true : false);
                $this->redirect_url = 'redir/' . $this->get_data_value('cid') ;
 
-               if (get_config('system','thread_allow') && $a->theme_thread_allow && !$this->is_toplevel()) {
+               if (Config::get('system','thread_allow') && $a->theme_thread_allow && !$this->is_toplevel()) {
                        $this->threaded = true;
                }
 
@@ -96,7 +100,12 @@ class Item extends BaseObject {
 
                $item = $this->get_data();
                $edited = false;
-               if (abs(strtotime($item['created']) - strtotime($item['edited'])) > 1) {
+               // If the time between "created" and "edited" differs we add
+               // a notice that the post was edited.
+               // Note: In some networks reshared items seem to have (sometimes) a difference
+               // between creation time and edit time of a second. Thats why we add the notice
+               // only if the difference is more than 1 second.
+               if (strtotime($item['edited']) - strtotime($item['created']) > 1) {
                        $edited = array(
                                'label'    => t('This entry was edited'),
                                'date'     => datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r'),
@@ -247,7 +256,7 @@ class Item extends BaseObject {
                                        'starred'   =>  t('starred'),
                                );
                                $r = dba::select('thread', array('ignored'), array('uid' => $item['uid'], 'iid' => $item['id']), array('limit' => 1));
-                               if (dbm::is_result($r)) {
+                               if (DBM::is_result($r)) {
                                        $ignore = array(
                                                'do'        => t("ignore thread"),
                                                'undo'      => t("unignore thread"),
@@ -658,7 +667,7 @@ class Item extends BaseObject {
         */
        private function get_comment_box($indent) {
                $a = $this->get_app();
-               if (!$this->is_toplevel() && !(get_config('system','thread_allow') && $a->theme_thread_allow)) {
+               if (!$this->is_toplevel() && !(Config::get('system','thread_allow') && $a->theme_thread_allow)) {
                        return '';
                }
 
@@ -677,7 +686,7 @@ class Item extends BaseObject {
                         * This should be better if done by a hook
                         */
                        if (in_array('qcomment',$a->plugins)) {
-                               $qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null);
+                               $qc = ((local_user()) ? PConfig::get(local_user(),'qcomment','words') : null);
                                $qcomment = (($qc) ? explode("\n",$qc) : null);
                        }
                        $comment_box = replace_macros($template,array(