code standards

[friendica.git] / src / Protocol / Feed.php

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index 86e831c705e6f9e310cf7b7b9a91a8a42e5135cb..0cf1db7cb799dcafe5789157953c3767f4fe265e 100644 (file)
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -318,7 +318,6 @@ class Feed {
                                $href = "";
                                $length = "";
                                $type = "";
-                               $title = "";
 
                                foreach ($enclosure->attributes AS $attribute) {
                                        if (in_array($attribute->name, ["url", "href"])) {
@@ -357,11 +356,20 @@ class Feed {
                        if (empty($body)) {
                                $body = trim(XML::getFirstNodeValue($xpath, 'content:encoded/text()', $entry));
                        }
-                       if (empty($body)) {
-                               $body = trim(XML::getFirstNodeValue($xpath, 'description/text()', $entry));
+
+                       $summary = trim(XML::getFirstNodeValue($xpath, 'atom:summary/text()', $entry));
+
+                       if (empty($summary)) {
+                               $summary = trim(XML::getFirstNodeValue($xpath, 'description/text()', $entry));
                        }
+
                        if (empty($body)) {
-                               $body = trim(XML::getFirstNodeValue($xpath, 'atom:summary/text()', $entry));
+                               $body = $summary;
+                               $summary = '';
+                       }
+
+                       if ($body == $summary) {
+                               $summary = '';
                        }
 
                        // remove the content of the title if it is identically to the body
@@ -412,6 +420,10 @@ class Feed {
                                $item["object-type"] = ACTIVITY_OBJ_BOOKMARK;
                                unset($item["attach"]);
                        } else {
+                               if (!empty($summary)) {
+                                       $item["body"] = '[abstract]' . HTML::toBBCode($summary, $basepath) . "[/abstract]\n" . $item["body"];
+                               }
+
                                if ($contact["fetch_further_information"] == 3) {
                                        if (!empty($tags)) {
                                                $item["tag"] = $tags;