Merge pull request #6432 from annando/deleted-pending

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index 2a4d2abf43b6d1971db094cffcaba8a65e969f13..a616fc8cc343022dcdbe7b0240f14795157cf8c5 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -214,8 +214,6 @@ function display_content(App $a, $update = false, $update_uid = 0)
                return;
        }
 
-       require_once 'include/conversation.php';
-
        $o = '';
 
        if ($update) {
@@ -291,8 +289,8 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
        $parent = Item::selectFirst(['uid'], ['uri' => $item_parent_uri, 'wall' => true]);
        if (DBA::isResult($parent)) {
-               $a->profile['uid'] = $parent['uid'];
-               $a->profile['profile_uid'] = $parent['uid'];
+               $a->profile['uid'] = defaults($a->profile, 'uid', $parent['uid']);
+               $a->profile['profile_uid'] = defaults($a->profile, 'profile_uid', $parent['uid']);
                $is_remote_contact = Contact::isFollower(remote_user(), $a->profile['profile_uid']);
        }