more reverts ...

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/include/Probe.php b/include/Probe.php
index 779476bce265337e222a2bfd5e5d862ff7e8e3d3..5c2ba86ccde08e0ec1a56926bc97f139859d9c99 100644 (file)
--- a/include/Probe.php
+++ b/include/Probe.php
@@ -232,7 +232,7 @@ class Probe {
                if ($data["photo"] != "")
                        $data["baseurl"] = matching_url(normalise_link($data["baseurl"]), normalise_link($data["photo"]));
                else
-                       $data["photo"] = $a->get_baseurl().'/images/person-175.jpg';
+                       $data["photo"] = App::get_baseurl().'/images/person-175.jpg';
 
                if (!isset($data["name"]) OR ($data["name"] == "")) {
                        if (isset($data["nick"]))

diff --git a/include/feed.php b/include/feed.php
index 7ce0729c6cac530eae535fc51a0b6d28282b2a6d..579ff7caae3652cce6c9fcb714720886bd32334f 100644 (file)
--- a/include/feed.php
+++ b/include/feed.php
@@ -59,8 +59,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
                                if ($attributes->name == "href")
                                        $author["author-link"] = $attributes->textContent;
 
-               $author["author-id"] = $xpath->evaluate('/atom:feed/atom:author/atom:uri/text()')->item(0)->nodeValue;
-
                if ($author["author-link"] == "")
                        $author["author-link"] = $author["author-id"];
 
@@ -144,10 +142,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
                $author["owner-link"] = $contact["url"];
                $author["owner-name"] = $contact["name"];
                $author["owner-avatar"] = $contact["thumb"];
-
-               // This is no field in the item table. So we have to unset it.
-               unset($author["author-nick"]);
-               unset($author["author-id"]);
        }
 
        $header = array();