diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-19 09:58:07 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-19 09:58:07 +0100 |
| commit | 8fbde780b37e3d5eeb2ee672a3474b3701eb9645 (patch) | |
| tree | f0519a2e726dbf4f659260e3c2e717874441981b /mod/follow.php | |
| parent | 878bdeccfd66b7b8229fd761c23ba13bc51c7454 (diff) | |
| parent | 7e33c1072a4a948941e2522afe0123899b0abddd (diff) | |
| download | volse-hubzilla-8fbde780b37e3d5eeb2ee672a3474b3701eb9645.tar.gz volse-hubzilla-8fbde780b37e3d5eeb2ee672a3474b3701eb9645.tar.bz2 volse-hubzilla-8fbde780b37e3d5eeb2ee672a3474b3701eb9645.zip | |
Merge branch 'master' of git://github.com/friendika/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')) |