aboutsummaryrefslogtreecommitdiffstats
path: root/include/network.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-03-23 16:36:27 -0700
committerredmatrix <git@macgirvin.com>2016-03-23 16:36:27 -0700
commitf200dd4395e1d0e2a6200844ec4827a943bf09ea (patch)
tree01e1ac97c9a7980f2a11601cdf20b76fd2483602 /include/network.php
parenta8ac0ed5494918862347a18314f5a994d3226fea (diff)
downloadvolse-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.
Diffstat (limited to 'include/network.php')
-rw-r--r--include/network.php5
1 files changed, 3 insertions, 2 deletions
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))