diff options
| author | redmatrix <git@macgirvin.com> | 2016-03-31 17:32:51 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-03-31 17:32:51 -0700 |
| commit | c0b3d7e1b480ceeed89b71efd056ed9edda2dfef (patch) | |
| tree | 433552545eb0c746fb48666afdb74ff472bf17b1 /mod/xrd.php | |
| parent | 50d9b2934742ad9fb0dc8354d405789e3c14cd00 (diff) | |
| parent | 9abd95fad3784a10fc48bc40f9b8a75d7d74edda (diff) | |
| download | volse-hubzilla-c0b3d7e1b480ceeed89b71efd056ed9edda2dfef.tar.gz volse-hubzilla-c0b3d7e1b480ceeed89b71efd056ed9edda2dfef.tar.bz2 volse-hubzilla-c0b3d7e1b480ceeed89b71efd056ed9edda2dfef.zip | |
Merge branch 'static'
Diffstat (limited to 'mod/xrd.php')
| -rw-r--r-- | mod/xrd.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/xrd.php b/mod/xrd.php index 0719407f6..463cda662 100644 --- a/mod/xrd.php +++ b/mod/xrd.php @@ -29,7 +29,7 @@ function xrd_init(&$a) { $dspr = replace_macros(get_markup_template('xrd_diaspora.tpl'),array( '$baseurl' => z_root(), - '$dspr_guid' => $r[0]['channel_guid'] . str_replace('.','',$a->get_hostname()), + '$dspr_guid' => $r[0]['channel_guid'] . str_replace('.','',App::get_hostname()), '$dspr_key' => base64_encode(pemtorsa($r[0]['channel_pubkey'])) )); @@ -39,7 +39,7 @@ function xrd_init(&$a) { header("Content-type: application/xrd+xml"); - $aliases = array('acct:' . $r[0]['channel_address'] . '@' . $a->get_hostname(), z_root() . '/channel/' . $r[0]['channel_address'], z_root() . '/~' . $r[0]['channel_address']); + $aliases = array('acct:' . $r[0]['channel_address'] . '@' . App::get_hostname(), z_root() . '/channel/' . $r[0]['channel_address'], z_root() . '/~' . $r[0]['channel_address']); for($x = 0; $x < count($aliases); $x ++) { if($aliases[$x] === $resource) |