clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3662 from annando/issue-3611 

Possibly Issue 3611: Better feed handling when there is no body
This commit is contained in:
Tobias Diekershoff 2017-08-27 09:59:15 +02:00 committed by GitHub
parent 3df2246a77 12ae59dba3
commit 93e447cbf0
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/feed.php
View File

@ -338,12 +338,22 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
if ($body == "") { if ($body == "") {
$body = trim($xpath->evaluate('atom:summary/text()', $entry)->item(0)->nodeValue); $body = trim($xpath->evaluate('atom:summary/text()', $entry)->item(0)->nodeValue);
} }
// remove the content of the title if it is identically to the body // remove the content of the title if it is identically to the body
// This helps with auto generated titles e.g. from tumblr // This helps with auto generated titles e.g. from tumblr
if (title_is_body($item["title"], $body)) { if (title_is_body($item["title"], $body)) {
$item["title"] = ""; $item["title"] = "";
} }
$item["body"] = html2bbcode($body); $item["body"] = html2bbcode($body);
if (($item["body"] == '') && ($item["title"] != '')) {
$item["body"] = $item["title"];
$item["title"] = '';
}
if (!strstr($item["body"], '[url') && ($item['plink'] != '')) {
$item["body"] .= "[hr][url]".$item['plink']."[/url]";
}
} }
if (!$simulate) { if (!$simulate) {