aboutsummaryrefslogtreecommitdiffstats
path: root/mod/poco.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-12-19 18:04:04 +0100
committerFabio Comuni <fabrix.xm@gmail.com>2011-12-19 18:04:04 +0100
commit2a3f94e4521f00142b99ba4fa5f4ec093159cbb7 (patch)
tree35dc0c015976fbba09d48b48c6dd1850be3bff53 /mod/poco.php
parentc3d12bc77ea3af6adc72f078d06bb9b199af6b45 (diff)
parent177af1fc9d286c4ecc7e5ce43e17f492b9e11817 (diff)
downloadvolse-hubzilla-2a3f94e4521f00142b99ba4fa5f4ec093159cbb7.tar.gz
volse-hubzilla-2a3f94e4521f00142b99ba4fa5f4ec093159cbb7.tar.bz2
volse-hubzilla-2a3f94e4521f00142b99ba4fa5f4ec093159cbb7.zip
Merge remote-tracking branch 'friendica/master'
Diffstat (limited to 'mod/poco.php')
-rw-r--r--mod/poco.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/mod/poco.php b/mod/poco.php
index dd8df6008..79cf820bc 100644
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -125,8 +125,11 @@ function poco_init(&$a) {
$entry['id'] = $rr['id'];
if($fields_ret['displayName'])
$entry['displayName'] = $rr['name'];
- if($fields_ret['urls'])
+ if($fields_ret['urls']) {
$entry['urls'] = array(array('value' => $rr['url'], 'type' => 'profile'));
+ if($rr['addr'] && ($rr['network'] !== NETWORK_MAIL))
+ $entry['urls'][] = array('value' => 'acct:' . $rr['addr'], 'type' => 'webfinger');
+ }
if($fields_ret['preferredUsername'])
$entry['preferredUsername'] = $rr['nick'];
if($fields_ret['photos'])