diff options
author | zotlabs <mike@macgirvin.com> | 2017-10-17 21:24:07 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-10-17 21:24:07 -0700 |
commit | 656ec585b22e62b496fe96002ee8ca7f9fd02d64 (patch) | |
tree | a5c49ace5fdc41e9a9ab4ffb065e7d3cc5914f7b /include | |
parent | 9497c6c0f7470800a54b0c8f60467f675b32c5ed (diff) | |
parent | 64a49eb54ac93b9fb3ba4f65894c60dba5620048 (diff) | |
download | volse-hubzilla-656ec585b22e62b496fe96002ee8ca7f9fd02d64.tar.gz volse-hubzilla-656ec585b22e62b496fe96002ee8ca7f9fd02d64.tar.bz2 volse-hubzilla-656ec585b22e62b496fe96002ee8ca7f9fd02d64.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include')
-rw-r--r-- | include/security.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/security.php b/include/security.php index 16c6f1680..450cc4f69 100644 --- a/include/security.php +++ b/include/security.php @@ -114,9 +114,9 @@ function atoken_xchan($atoken) { 'atoken_id' => $atoken['atoken_id'], 'xchan_hash' => substr($c['channel_hash'],0,16) . '.' . $atoken['atoken_name'], 'xchan_name' => $atoken['atoken_name'], - 'xchan_addr' => t('guest:') . $atoken['atoken_name'] . '@' . \App::get_hostname(), + 'xchan_addr' => 'guest:' . $atoken['atoken_name'] . '@' . \App::get_hostname(), 'xchan_network' => 'unknown', - 'xchan_url' => z_root(), + 'xchan_url' => z_root() . '/guest/' . substr($c['channel_hash'],0,16) . '.' . $atoken['atoken_name'], 'xchan_hidden' => 1, 'xchan_photo_mimetype' => 'image/jpeg', 'xchan_photo_l' => get_default_profile_photo(300), |