aboutsummaryrefslogtreecommitdiffstats
path: root/include/feedutils.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-06-14 16:11:57 -0700
committerzotlabs <mike@macgirvin.com>2017-06-14 16:11:57 -0700
commit1ac799f629d6f2d86618fdcda7519473d8121552 (patch)
tree78361e3c904476df66273a588ac8330d4e742249 /include/feedutils.php
parent7b948bdd29e44920e4c1af9bcba26958220daca2 (diff)
parent1f075d92bc4e47ae282f811d10c31cd6f09191a6 (diff)
downloadvolse-hubzilla-1ac799f629d6f2d86618fdcda7519473d8121552.tar.gz
volse-hubzilla-1ac799f629d6f2d86618fdcda7519473d8121552.tar.bz2
volse-hubzilla-1ac799f629d6f2d86618fdcda7519473d8121552.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'include/feedutils.php')
-rw-r--r--include/feedutils.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/feedutils.php b/include/feedutils.php
index 68af88256..f5cb12cd9 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -354,6 +354,7 @@ function get_atom_elements($feed, $item, &$author) {
// No photo/profile-link on the item - look at the feed level
+
if((! (x($author,'author_link'))) || (! (x($author,'author_photo')))) {
$rawauthor = $feed->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
@@ -1509,7 +1510,7 @@ function atom_entry($item, $type, $author, $owner, $comment = false, $cid = 0, $
if(($item['parent'] != $item['id']) || ($item['parent_mid'] !== $item['mid']) || (($item['thr_parent'] !== '') && ($item['thr_parent'] !== $item['mid']))) {
$parent_item = (($item['thr_parent']) ? $item['thr_parent'] : $item['parent_mid']);
- $o .= '<thr:in-reply-to ref="' . 'X-ZOT:' . xmlify($parent_item) . '" type="text/html" href="' . xmlify($item['plink']) . '" />' . "\r\n";
+ $o .= '<thr:in-reply-to ref="' . xmlify($parent_item) . '" type="text/html" href="' . xmlify($item['plink']) . '" />' . "\r\n";
}
if(activity_match($item['obj_type'],ACTIVITY_OBJ_EVENT) && activity_match($item['verb'],ACTIVITY_POST)) {