diff options
| author | redmatrix <git@macgirvin.com> | 2016-03-23 16:36:27 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-03-23 16:36:27 -0700 |
| commit | f200dd4395e1d0e2a6200844ec4827a943bf09ea (patch) | |
| tree | 01e1ac97c9a7980f2a11601cdf20b76fd2483602 | |
| parent | a8ac0ed5494918862347a18314f5a994d3226fea (diff) | |
| download | volse-hubzilla-f200dd4395e1d0e2a6200844ec4827a943bf09ea.tar.gz volse-hubzilla-f200dd4395e1d0e2a6200844ec4827a943bf09ea.tar.bz2 volse-hubzilla-f200dd4395e1d0e2a6200844ec4827a943bf09ea.zip | |
atom specifies a uri or iri for the id. message_id isn't suitable here.
| -rwxr-xr-x | include/items.php | 4 | ||||
| -rw-r--r-- | include/network.php | 5 | ||||
| -rw-r--r-- | version.inc | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/include/items.php b/include/items.php index c3a0b82d2..879f8ea12 100755 --- a/include/items.php +++ b/include/items.php @@ -4214,7 +4214,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="' . xmlify($parent_item) . '" type="text/html" href="' . xmlify($item['plink']) . '" />' . "\r\n"; + $o .= '<thr:in-reply-to ref="' . z_root() . '/display/' . 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)) { @@ -4232,7 +4232,7 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) { $o .= '<content type="' . $type . '" >' . xmlify(prepare_text($body,$item['mimetype'])) . '</content>' . "\r\n"; } - $o .= '<id>' . xmlify($item['mid']) . '</id>' . "\r\n"; + $o .= '<id>' . z_root() . '/display/' . xmlify($item['mid']) . '</id>' . "\r\n"; $o .= '<published>' . xmlify(datetime_convert('UTC','UTC',$item['created'] . '+00:00',ATOM_TIME)) . '</published>' . "\r\n"; $o .= '<updated>' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '</updated>' . "\r\n"; diff --git a/include/network.php b/include/network.php index dd0089bf8..e7d341321 100644 --- a/include/network.php +++ b/include/network.php @@ -1254,6 +1254,7 @@ function discover_by_webbie($webbie) { if($feed_meta['hubs'] && $address) { set_xconfig($address,'system','push_hubs',$feed_meta['hubs']); + set_xconfig($address,'system','feed_url',$atom_feed); } if($feed_meta['author']['author_name']) { $fullname = $feed_meta['author']['author_name']; @@ -1459,8 +1460,8 @@ function find_webfinger_location($j,$rhs) { function match_webfinger_location($s,$h) { - // GNU-social and the older StatusNet - if(preg_match('|' . $h . '/user/([0-9]*?)$|',$s)) + // GNU-social and the older StatusNet - the $host/user/123 form doesn't work + if(preg_match('|' . $h . '/index.php/user/([0-9]*?)$|',$s)) return $s; // Redmatrix / hubzilla if(preg_match('|' . $h . '/channel/|',$s)) diff --git a/version.inc b/version.inc index fe23fb3bf..c21e13b14 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-03-22.1343H +2016-03-23.1344H |