Also removed this, seems to come in from wrong merging? #3010 Thanks to @annando

[friendica.git] / include / feed.php

diff --git a/include/feed.php b/include/feed.php
index 579ff7caae3652cce6c9fcb714720886bd32334f..7ce0729c6cac530eae535fc51a0b6d28282b2a6d 100644 (file)
--- a/include/feed.php
+++ b/include/feed.php
@@ -59,6 +59,8 @@ 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"];
 
@@ -142,6 +144,10 @@ 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();