aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-08-12 21:01:51 -0700
committerFriendika <info@friendika.com>2011-08-12 21:01:51 -0700
commite15e18e0d1499a91f6e3d20553a09af534c471f7 (patch)
treeb871ba05ec4d741425961e0ce7023faef3cb800c /include
parente1db1369664cd4299dd5bdcb463e549c602213f0 (diff)
downloadvolse-hubzilla-e15e18e0d1499a91f6e3d20553a09af534c471f7.tar.gz
volse-hubzilla-e15e18e0d1499a91f6e3d20553a09af534c471f7.tar.bz2
volse-hubzilla-e15e18e0d1499a91f6e3d20553a09af534c471f7.zip
hopefully fix statusnet bug by altering our feed format slightly
Diffstat (limited to 'include')
-rw-r--r--include/items.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php
index be231f34d..ec519ad9b 100644
--- a/include/items.php
+++ b/include/items.php
@@ -112,7 +112,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
$items = $r;
- $feed_template = get_markup_template('atom_feed.tpl');
+ $feed_template = get_markup_template(($dfrn_id) ? 'atom_feed_dfrn.tpl' : 'atom_feed.tpl');
$atom = '';
@@ -1038,7 +1038,9 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
if(count($hubs))
$hub = implode(',', $hubs);
- $rawtags = $feed->get_feed_tags( SIMPLEPIE_NAMESPACE_ATOM_10, 'author');
+ $rawtags = $feed->get_feed_tags( NAMESPACE_DFRN, 'owner');
+ if(! $rawtags)
+ $rawtags = $feed->get_feed_tags( SIMPLEPIE_NAMESPACE_ATOM_10, 'author');
if($rawtags) {
$elems = $rawtags[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10];
if($elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated']) {