aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorgit-marijus <mario@mariovavti.com>2017-07-16 21:02:28 +0200
committergit-marijus <mario@mariovavti.com>2017-07-16 21:02:28 +0200
commit5408264559fe79a0d55824f7bac909162822faeb (patch)
tree13b3982d87504b971c5e8119511f6d009e4fb85a /Zotlabs
parentbd17dc52f263206923fca43bf5c15b0754e66c82 (diff)
parente891199a23eb8839f0a6baa4b5695b058793917f (diff)
downloadvolse-hubzilla-5408264559fe79a0d55824f7bac909162822faeb.tar.gz
volse-hubzilla-5408264559fe79a0d55824f7bac909162822faeb.tar.bz2
volse-hubzilla-5408264559fe79a0d55824f7bac909162822faeb.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Wfinger.php2
-rw-r--r--Zotlabs/Module/Xrd.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Wfinger.php b/Zotlabs/Module/Wfinger.php
index 9623a676b..07a7b7735 100644
--- a/Zotlabs/Module/Wfinger.php
+++ b/Zotlabs/Module/Wfinger.php
@@ -117,7 +117,7 @@ class Wfinger extends \Zotlabs\Web\Controller {
[
'rel' => 'http://ostatus.org/schema/1.0/subscribe',
- 'template' => z_root() . '/follow/url={uri}',
+ 'template' => z_root() . '/follow?f=&url={uri}',
],
[
diff --git a/Zotlabs/Module/Xrd.php b/Zotlabs/Module/Xrd.php
index 9630e9ab4..64e5042cb 100644
--- a/Zotlabs/Module/Xrd.php
+++ b/Zotlabs/Module/Xrd.php
@@ -57,7 +57,7 @@ class Xrd extends \Zotlabs\Web\Controller {
'$poco_url' => z_root() . '/poco/' . $r[0]['channel_address'],
'$photo' => z_root() . '/photo/profile/l/' . $r[0]['channel_id'],
'$modexp' => 'data:application/magic-public-key,' . $salmon_key,
- '$subscribe' => z_root() . '/follow?url={uri}',
+ '$subscribe' => z_root() . '/follow?f=&url={uri}',
));