aboutsummaryrefslogtreecommitdiffstats
path: root/mod/xrd.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-08-27 17:57:59 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-08-27 17:57:59 +0200
commit1b82fb7349a7a4048755d92e757efc5dc227b227 (patch)
treee614f70f830ed518b185f22203f42c91aea36db0 /mod/xrd.php
parent092e7378cdaeefaa7b4a954bd865bba1960f01aa (diff)
parent7b28c42693ff41da61abe4974c7a0a7412b6d6e5 (diff)
downloadvolse-hubzilla-1b82fb7349a7a4048755d92e757efc5dc227b227.tar.gz
volse-hubzilla-1b82fb7349a7a4048755d92e757efc5dc227b227.tar.bz2
volse-hubzilla-1b82fb7349a7a4048755d92e757efc5dc227b227.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/xrd.php')
-rw-r--r--mod/xrd.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/xrd.php b/mod/xrd.php
index 4fa81c7f3..d547194ad 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -24,7 +24,7 @@ function xrd_init(&$a) {
$dspr = replace_macros(get_markup_template('xrd_diaspora.tpl'),array(
'$baseurl' => $a->get_baseurl(),
- '$dspr_guid' => $r[0]['channel_guid'],
+ '$dspr_guid' => $r[0]['channel_guid'] . str_replace('.','',$a->get_hostname()),
'$dspr_key' => base64_encode(pemtorsa($r[0]['channel_pubkey']))
));