Don't allow deletion of public posts

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

diff --git a/src/Object/Post.php b/src/Object/Post.php
index 74dc24b2f3843891dc317304ffd801dab84a1284..a66e48a380b26995c5917d795e69c51d01933592 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -192,12 +192,19 @@ class Post extends BaseObject
                        'delete'   => $delete,
                ];
 
-               if (!local_user()) {
+               if (!local_user() || ($item['uid'] == 0)) {
                        $drop = false;
                }
 
                $filer = (($conv->getProfileOwner() == local_user() && ($item['uid'] != 0)) ? L10n::t("save to folder") : false);
 
+               if ($item['network'] == NETWORK_FEED) {
+                       $item['author-avatar'] = $item['contact-avatar'];
+                       $item['author-name'] = $item['contact-name'];
+                       $item['owner-avatar'] = $item['contact-avatar'];
+                       $item['owner-name'] = $item['contact-name'];
+               }
+
                $diff_author = !link_compare($item['url'], $item['author-link']);
                $profile_name = htmlentities(((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']);
                if ($item['author-link'] && (!$item['author-name'])) {
@@ -209,14 +216,6 @@ class Post extends BaseObject
                        $sparkle = ' sparkle';
                }
 
-               if (($item['network'] == NETWORK_FEED) || empty($item['author-thumb'])) {
-                       $item['author-thumb'] = $item['author-avatar'];
-               }
-
-               if (($item['network'] == NETWORK_FEED) || empty($item['owner-thumb'])) {
-                       $item['owner-thumb'] = $item['owner-avatar'];
-               }
-
                $locate = ['location' => $item['location'], 'coord' => $item['coord'], 'html' => ''];
                Addon::callHooks('render_location', $locate);
                $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate));
@@ -369,7 +368,7 @@ class Post extends BaseObject
                        'profile_url'     => $profile_link,
                        'item_photo_menu' => item_photo_menu($item),
                        'name'            => $name_e,
-                       'thumb'           => $a->remove_baseurl(proxy_url($item['author-thumb'], false, PROXY_SIZE_THUMB)),
+                       'thumb'           => $a->remove_baseurl(proxy_url($item['author-avatar'], false, PROXY_SIZE_THUMB)),
                        'osparkle'        => $osparkle,
                        'sparkle'         => $sparkle,
                        'title'           => $title_e,
@@ -382,7 +381,7 @@ class Post extends BaseObject
                        'indent'          => $indent,
                        'shiny'           => $shiny,
                        'owner_url'       => $this->getOwnerUrl(),
-                       'owner_photo'     => $a->remove_baseurl(proxy_url($item['owner-thumb'], false, PROXY_SIZE_THUMB)),
+                       'owner_photo'     => $a->remove_baseurl(proxy_url($item['owner-avatar'], false, PROXY_SIZE_THUMB)),
                        'owner_name'      => htmlentities($owner_name_e),
                        'plink'           => get_plink($item),
                        'edpost'          => Feature::isEnabled($conv->getProfileOwner(), 'edit_posts') ? $edpost : '',