harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

atom specifies a uri or iri for the id. message_id isn't suitable here.

Browse Source
This commit is contained in:
redmatrix
2016-03-23 16:36:27 -07:00
parent a8ac0ed549
commit f200dd4395
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/network.php
View File

@@ -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))