aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-05-05 10:03:57 +0200
committerMario Vavti <mario@mariovavti.com>2018-05-05 10:03:57 +0200
commit0895756658e3019b2badf876d4699e298234208c (patch)
treec3701fa287801dc937c327de999b51bcba2248c2 /Zotlabs
parent192b69b11a05adee52e09d434bab004e0b0d07d1 (diff)
parentc6e65ec6dab38ee67afe1d07f5c003413cfdf67e (diff)
downloadvolse-hubzilla-0895756658e3019b2badf876d4699e298234208c.tar.gz
volse-hubzilla-0895756658e3019b2badf876d4699e298234208c.tar.bz2
volse-hubzilla-0895756658e3019b2badf876d4699e298234208c.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Wfinger.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/Zotlabs/Module/Wfinger.php b/Zotlabs/Module/Wfinger.php
index 81d4beaed..88cb3e879 100644
--- a/Zotlabs/Module/Wfinger.php
+++ b/Zotlabs/Module/Wfinger.php
@@ -109,7 +109,8 @@ class Wfinger extends \Zotlabs\Web\Controller {
$aliases = array(
z_root() . (($pchan) ? '/pchan/' : '/channel/') . $r[0]['channel_address'],
- z_root() . '/~' . $r[0]['channel_address']
+ z_root() . '/~' . $r[0]['channel_address'],
+ z_root() . '/@' . $r[0]['channel_address']
);
if($h) {