Fix last reference of replaced variable $owner_nick in Protocol\Feed::atom()

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

diff --git a/src/Object/Post.php b/src/Object/Post.php
index 7467e4ffc753dbf47aa3a908b86ac85ddaa1fb0e..c81b49580f5b9d0c42be239d2858aab9e4b5529a 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -218,9 +218,9 @@ class Post
                if (DI::userSession()->getLocalUserId()) {
                        if (Strings::compareLink(DI::session()->get('my_url'), $item['author-link'])) {
                                if ($item['event-id'] != 0) {
-                                       $edpost = ['events/event/' . $item['event-id'], DI::l10n()->t('Edit')];
+                                       $edpost = ['calendar/event/edit/' . $item['event-id'], DI::l10n()->t('Edit')];
                                } else {
-                                       $edpost = ['editpost/' . $item['id'], DI::l10n()->t('Edit')];
+                                       $edpost = [sprintf('post/%s/edit', $item['id']), DI::l10n()->t('Edit')];
                                }
                        }
                        $dropping = in_array($item['uid'], [0, DI::userSession()->getLocalUserId()]);
@@ -280,7 +280,7 @@ class Post
                        $profile_link = $item['author-link'];
                }
 
-               if (strpos($profile_link, 'redir/') === 0) {
+               if (strpos($profile_link, 'contact/redir/') === 0) {
                        $sparkle = ' sparkle';
                }
 
@@ -587,16 +587,10 @@ class Post
 
                // Copy values/set defaults
                $result['total_comments_num'] = $this->isToplevel() ? $total_children : 0;
-               $result['private'] = $item['private'];
-               $result['toplevel'] = ($this->isToplevel() ? 'toplevel_item' : '');
-               $result['flatten'] = false;
-               $result['threaded'] = false;
-
-               if ($this->isThreaded()) {
-                       $result['threaded'] = true;
-               } else {
-                       $result['flatten'] = true;
-               }
+               $result['private']            = $item['private'];
+               $result['toplevel']           = ($this->isToplevel() ? 'toplevel_item' : '');
+               $result['flatten']            = !$this->isThreaded();
+               $result['threaded']           = $this->isThreaded();
 
                return $result;
        }
@@ -628,7 +622,7 @@ class Post
        public function addChild(Post $item)
        {
                if (!$item->getId()) {
-                       Logger::fatal('Post object has no id', ['post' => $item]);
+                       Logger::error('Post object has no id', ['post' => $item]);
                        return false;
                } elseif ($this->getChild($item->getId())) {
                        Logger::warning('Post object already exists', ['post' => $item]);
@@ -639,7 +633,7 @@ class Post
                 * Only add what will be displayed
                 */
                if ($item->getDataValue('network') === Protocol::MAIL && DI::userSession()->getLocalUserId() != $item->getDataValue('uid')) {
-                       Logger::warning('Post object does not belong to local user', ['post' => $item, 'local_user' => $local_user]);
+                       Logger::warning('Post object does not belong to local user', ['post' => $item, 'local_user' => DI::userSession()->getLocalUserId()]);
                        return false;
                } elseif (DI::activity()->match($item->getDataValue('verb'), Activity::LIKE) ||
                          DI::activity()->match($item->getDataValue('verb'), Activity::DISLIKE)) {