diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-24 20:21:30 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-24 20:21:30 -0700 |
| commit | dfa4984089449b257315536b3d9f949df375405f (patch) | |
| tree | 9524f24c43bdbaaa427cffdcb49400d5cc95bb7d /mod/webfinger.php | |
| parent | 27137e48eba585c6d61a7b34436661b29af77760 (diff) | |
| parent | 1828771557be409aea396751628966b02f3e2872 (diff) | |
| download | volse-hubzilla-dfa4984089449b257315536b3d9f949df375405f.tar.gz volse-hubzilla-dfa4984089449b257315536b3d9f949df375405f.tar.bz2 volse-hubzilla-dfa4984089449b257315536b3d9f949df375405f.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Diffstat (limited to 'mod/webfinger.php')
| -rw-r--r-- | mod/webfinger.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/mod/webfinger.php b/mod/webfinger.php index 74bd2c954..a646961a8 100644 --- a/mod/webfinger.php +++ b/mod/webfinger.php @@ -14,10 +14,15 @@ function webfinger_content(&$a) { if(x($_GET,'addr')) { $addr = trim($_GET['addr']); - if(strpos($addr,'@' !== false)) - $res = webfinger($addr); - else - $res = lrdd($addr); + if(strpos($addr,'@') !== false) { + $res = webfinger_rfc7033($addr); + if(! $res) + $res = old_webfinger($addr); + } + else { + if(function_exists('lrdd')) + $res = lrdd($addr); + } $o .= '<pre>'; $o .= str_replace("\n",'<br />',print_r($res,true)); $o .= '</pre>'; |