diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-03-23 14:04:35 +0100 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-03-23 14:04:35 +0100 |
| commit | 1f1fe4d5be45599b92846e95ac1d8a1134ee3cd1 (patch) | |
| tree | 629a2c3cb457293bbe77c956011ad370aa087a78 /mod/follow.php | |
| parent | 4a1426934968384d10a38f335a1c0c49b058dc2d (diff) | |
| parent | 93504896155d74fc42f6bf60cb61d65295f6b911 (diff) | |
| download | volse-hubzilla-1f1fe4d5be45599b92846e95ac1d8a1134ee3cd1.tar.gz volse-hubzilla-1f1fe4d5be45599b92846e95ac1d8a1134ee3cd1.tar.bz2 volse-hubzilla-1f1fe4d5be45599b92846e95ac1d8a1134ee3cd1.zip | |
Merge branch 'master' of github.com:fabrixxm/friendika
Diffstat (limited to 'mod/follow.php')
| -rw-r--r-- | mod/follow.php | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/mod/follow.php b/mod/follow.php index 689ae8232..4ce3ccb82 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -11,7 +11,7 @@ function follow_post(&$a) { } $url = $orig_url = notags(trim($_POST['url'])); - + $diaspora = false; $email_conversant = false; if($url) { @@ -28,6 +28,9 @@ function follow_post(&$a) { $hcard = unamp($link['@attributes']['href']); if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') $profile = unamp($link['@attributes']['href']); + if($link['@attributes']['rel'] === 'http://joindiaspora.com/seed_location') + $diaspora = true; + } @@ -90,9 +93,12 @@ function follow_post(&$a) { } } - if(! $profile) - $profile = $url; - + if(! $profile) { + if($diaspora) + $profile = $hcard; + else + $profile = $url; + } if(! x($vcard,'fn')) if(x($vcard,'nick')) |