aboutsummaryrefslogtreecommitdiffstats
path: root/mod/xrd.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-03-30 22:13:24 -0700
committerredmatrix <git@macgirvin.com>2016-03-30 22:13:24 -0700
commit1cd3b4182595b838a535dd6b6990251db05d49e6 (patch)
tree2d22ab3140caf9d7efcd46a1f30f81a833ebf6fd /mod/xrd.php
parent4148211086ff53dfb6fb4e969fd067389bcfef29 (diff)
downloadvolse-hubzilla-1cd3b4182595b838a535dd6b6990251db05d49e6.tar.gz
volse-hubzilla-1cd3b4182595b838a535dd6b6990251db05d49e6.tar.bz2
volse-hubzilla-1cd3b4182595b838a535dd6b6990251db05d49e6.zip
deprecate $a->get_baseurl()
Diffstat (limited to 'mod/xrd.php')
-rw-r--r--mod/xrd.php20
1 files changed, 10 insertions, 10 deletions
diff --git a/mod/xrd.php b/mod/xrd.php
index ed8e1eabe..0719407f6 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -28,7 +28,7 @@ function xrd_init(&$a) {
killme();
$dspr = replace_macros(get_markup_template('xrd_diaspora.tpl'),array(
- '$baseurl' => $a->get_baseurl(),
+ '$baseurl' => z_root(),
'$dspr_guid' => $r[0]['channel_guid'] . str_replace('.','',$a->get_hostname()),
'$dspr_key' => base64_encode(pemtorsa($r[0]['channel_pubkey']))
));
@@ -51,17 +51,17 @@ function xrd_init(&$a) {
'$nick' => $r[0]['channel_address'],
'$accturi' => $resource,
'$aliases' => $aliases,
- '$profile_url' => $a->get_baseurl() . '/channel/' . $r[0]['channel_address'],
- '$hcard_url' => $a->get_baseurl() . '/hcard/' . $r[0]['channel_address'],
- '$atom' => $a->get_baseurl() . '/feed/' . $r[0]['channel_address'],
- '$zot_post' => $a->get_baseurl() . '/post/' . $r[0]['channel_address'],
- '$poco_url' => $a->get_baseurl() . '/poco/' . $r[0]['channel_address'],
- '$photo' => $a->get_baseurl() . '/photo/profile/l/' . $r[0]['channel_id'],
+ '$profile_url' => z_root() . '/channel/' . $r[0]['channel_address'],
+ '$hcard_url' => z_root() . '/hcard/' . $r[0]['channel_address'],
+ '$atom' => z_root() . '/feed/' . $r[0]['channel_address'],
+ '$zot_post' => z_root() . '/post/' . $r[0]['channel_address'],
+ '$poco_url' => z_root() . '/poco/' . $r[0]['channel_address'],
+ '$photo' => z_root() . '/photo/profile/l/' . $r[0]['channel_id'],
'$dspr' => $dspr,
-// '$salmon' => $a->get_baseurl() . '/salmon/' . $r[0]['channel_address'],
-// '$salmen' => $a->get_baseurl() . '/salmon/' . $r[0]['channel_address'] . '/mention',
+// '$salmon' => z_root() . '/salmon/' . $r[0]['channel_address'],
+// '$salmen' => z_root() . '/salmon/' . $r[0]['channel_address'] . '/mention',
'$modexp' => 'data:application/magic-public-key,' . $salmon_key,
- '$subscribe' => $a->get_baseurl() . '/follow?url={uri}',
+ '$subscribe' => z_root() . '/follow?url={uri}',
'$bigkey' => salmon_key($r[0]['channel_pubkey'])
));