Merge pull request #3690 from annando/diaspora-like

[friendica.git] / include / feed.php

diff --git a/include/feed.php b/include/feed.php
index 91bbb286edf4fa54e79b919027a0818095374433..12cf06ca5093d6d674a3569bd76e05f1349c0de9 100644 (file)
--- a/include/feed.php
+++ b/include/feed.php
@@ -346,15 +346,13 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
                        }
                        $item["body"] = html2bbcode($body);
 
-                       if ($item["body"] == "") {
-                               if ($item["title"] != '') {
-                                       $item["body"] = $item["title"];
-                                       $item["title"] = '';
-                               }
+                       if (($item["body"] == '') && ($item["title"] != '')) {
+                               $item["body"] = $item["title"];
+                               $item["title"] = '';
                        }
 
                        if (!strstr($item["body"], '[url') && ($item['plink'] != '')) {
-                               $item["body"] .= "\n[hr]\n[url]".$item['plink']."[/url]";
+                               $item["body"] .= "[hr][url]".$item['plink']."[/url]";
                        }
                }