Continued:

[friendica.git] / src / Object / Post.php

diff --git a/src/Object/Post.php b/src/Object/Post.php
index 198ca658061a203c9b23f7d49c13abea20f37811..820730a32b9e01a4942af6b24c3eeca6a82d3eb3 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -8,12 +8,14 @@ use Friendica\BaseObject;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Feature;
 use Friendica\Core\Addon;
+use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
 use dba;
 
 require_once 'include/dba.php';
@@ -76,7 +78,7 @@ class Post extends BaseObject
                }
 
                // Prepare the children
-               if (count($data['children'])) {
+               if (!empty($data['children'])) {
                        foreach ($data['children'] as $item) {
                                // Only add will be displayed
                                if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
@@ -125,7 +127,7 @@ class Post extends BaseObject
                        $edited = [
                                'label'    => L10n::t('This entry was edited'),
                                'date'     => DateTimeFormat::local($item['edited'], 'r'),
-                               'relative' => relative_date($item['edited'])
+                               'relative' => Temporal::getRelativeDate($item['edited'])
                        ];
                }
                $commentww = '';
@@ -314,7 +316,13 @@ class Post extends BaseObject
                $body_e       = $body;
                $text_e       = strip_tags($body);
                $name_e       = $profile_name;
-               $title_e      = $item['title'];
+
+               if (!empty($item['content-warning']) && PConfig::get(local_user(), 'system', 'disable_cw', false)) {
+                       $title_e = ucfirst($item['content-warning']);
+               } else {
+                       $title_e = $item['title'];
+               }
+
                $location_e   = $location;
                $owner_name_e = $this->getOwnerName();
 
@@ -336,6 +344,7 @@ class Post extends BaseObject
                $tmp_item = [
                        'template'        => $this->getTemplate(),
                        'type'            => implode("", array_slice(explode("/", $item['verb']), -1)),
+                       'suppress_tags'   => Config::get('system', 'suppress_tags'),
                        'tags'            => $item['tags'],
                        'hashtags'        => $item['hashtags'],
                        'mentions'        => $item['mentions'],
@@ -365,9 +374,9 @@ class Post extends BaseObject
                        'sparkle'         => $sparkle,
                        'title'           => $title_e,
                        'localtime'       => DateTimeFormat::local($item['created'], 'r'),
-                       'ago'             => $item['app'] ? L10n::t('%s from %s', relative_date($item['created']), $item['app']) : relative_date($item['created']),
+                       'ago'             => $item['app'] ? L10n::t('%s from %s', Temporal::getRelativeDate($item['created']), $item['app']) : Temporal::getRelativeDate($item['created']),
                        'app'             => $item['app'],
-                       'created'         => relative_date($item['created']),
+                       'created'         => Temporal::getRelativeDate($item['created']),
                        'lock'            => $lock,
                        'location'        => $location_e,
                        'indent'          => $indent,