Bugfix for pull request 3216 - feed items were mixed

diff --git a/include/feed.php b/include/feed.php
index e0fef50dbbc6f7ed832e11451bf6bed47df3c9f6..13833d22ef7117a38294b6e721afe8f201f76e96 100644 (file)
--- a/include/feed.php
+++ b/include/feed.php
@@ -177,6 +177,10 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
        foreach (array_reverse($entrylist) AS $entry) {
                $item = array_merge($header, $author);
 
+               $alternate = $xpath->query("atom:link[@rel='alternate']", $entry)->item(0)->attributes;
+               if (!is_object($alternate))
+                       $alternate = $xpath->query("atom:link", $entry)->item(0)->attributes;
+
                if (is_object($alternate))
                        foreach($alternate AS $attributes)
                                if ($attributes->name == "href")
@@ -217,10 +221,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
                if ($item["title"] == "")
                        $item["title"] = $xpath->evaluate('rss:title/text()', $entry)->item(0)->nodeValue;
 
-               $alternate = $xpath->query("atom:link[@rel='alternate']", $entry)->item(0)->attributes;
-               if (!is_object($alternate))
-                       $alternate = $xpath->query("atom:link", $entry)->item(0)->attributes;
-
                $published = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue;
 
                if ($published == "")