diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-12 20:50:27 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-12 20:50:27 -0700 |
| commit | 6424bac47ce7f81991d23d2407cbb4c08dbfdf69 (patch) | |
| tree | 5a664f58749fe45923f77881310cdd295859afb5 /include/security.php | |
| parent | a01baab4f0dc1654dfe2d2cc6fc78e5c3c8d9f4e (diff) | |
| parent | bdd7d24ac1ccf8f7c5b8939cf23a6a156da959c1 (diff) | |
| download | volse-hubzilla-6424bac47ce7f81991d23d2407cbb4c08dbfdf69.tar.gz volse-hubzilla-6424bac47ce7f81991d23d2407cbb4c08dbfdf69.tar.bz2 volse-hubzilla-6424bac47ce7f81991d23d2407cbb4c08dbfdf69.zip | |
Merge branch 'dev' into perms
Diffstat (limited to 'include/security.php')
| -rw-r--r-- | include/security.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/security.php b/include/security.php index 6c245fa09..212690d91 100644 --- a/include/security.php +++ b/include/security.php @@ -125,7 +125,7 @@ function change_channel($change_channel) { ); if($x) { $_SESSION['my_url'] = $x[0]['xchan_url']; - $_SESSION['my_address'] = $r[0]['channel_address'] . '@' . substr(z_root(), strpos(z_root(), '://') + 3); + $_SESSION['my_address'] = $r[0]['channel_address'] . '@' . App::get_hostname(); App::set_observer($x[0]); App::set_perms(get_all_perms(local_channel(), $hash)); |