Merge pull request #6737 from MrPetovan/bug/6630-fix-empty-label-profile

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index a616fc8cc343022dcdbe7b0240f14795157cf8c5..2e931e0687e60b2d02189c33a1dd18303977c118 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -35,7 +35,6 @@ function display_init(App $a)
        }
 
        $nick = (($a->argc > 1) ? $a->argv[1] : '');
-       $profiledata = [];
 
        if ($a->argc == 3) {
                if (substr($a->argv[2], -5) == '.atom') {
@@ -96,7 +95,7 @@ function display_init(App $a)
        }
 
        if ($item["id"] != $item["parent"]) {
-               $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $item["parent"]]);
+               $item = Item::selectFirstForUser($item_user, $fields, ['id' => $item["parent"]]);
        }
 
        $profiledata = display_fetchauthor($a, $item);
@@ -157,7 +156,6 @@ function display_fetchauthor($a, $item)
        }
 
        if (!$skip) {
-               $author = "";
                preg_match("/author='(.*?)'/ism", $attributes, $matches);
                if (!empty($matches[1])) {
                        $profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
@@ -166,7 +164,6 @@ function display_fetchauthor($a, $item)
                if (!empty($matches[1])) {
                        $profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
                }
-               $profile = "";
                preg_match("/profile='(.*?)'/ism", $attributes, $matches);
                if (!empty($matches[1])) {
                        $profiledata["url"] = $matches[1];
@@ -175,7 +172,6 @@ function display_fetchauthor($a, $item)
                if (!empty($matches[1])) {
                        $profiledata["url"] = $matches[1];
                }
-               $avatar = "";
                preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
                if (!empty($matches[1])) {
                        $profiledata["photo"] = $matches[1];
@@ -426,5 +422,5 @@ function displayShowFeed($item_id, $conversation)
        }
        header("Content-type: application/atom+xml");
        echo $xml;
-       killme();
+       exit();
 }