Merge pull request #7810 from annando/diaspora-add-contact

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index 8513788dfca9eb9244434b67b1d13bd3868a323e..12fa8d7ecefb9c320e71b641b2f0e9af216cc2d0 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -276,8 +276,8 @@ function display_content(App $a, $update = false, $update_uid = 0)
        if (isset($item_parent_uri)) {
                $parent = Item::selectFirst(['uid'], ['uri' => $item_parent_uri, 'wall' => true]);
                if (DBA::isResult($parent)) {
-                       $a->profile['uid'] = defaults($a->profile, 'uid', $parent['uid']);
-                       $a->profile['profile_uid'] = defaults($a->profile, 'profile_uid', $parent['uid']);
+                       $a->profile['uid'] = ($a->profile['uid'] ?? 0) ?: $parent['uid'];
+                       $a->profile['profile_uid'] = ($a->profile['profile_uid'] ?? 0) ?: $parent['uid'];
                        $is_remote_contact = Session::getRemoteContactID($a->profile['profile_uid']);
                        if ($is_remote_contact) {
                                $item_uid = $parent['uid'];