diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-07-12 21:43:05 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-07-12 21:43:05 -0400 |
| commit | 513175982367a970d491948f7d8aa1488f6a4340 (patch) | |
| tree | c97fe4dcdd92383144123844fa27fb03ed1af2d9 /include/security.php | |
| parent | 1e4ef812445e4d8617223ce917d0eb2215e9c3b3 (diff) | |
| parent | b6987b4287bb2492b8f4000bdef08b376aa5f265 (diff) | |
| download | volse-hubzilla-513175982367a970d491948f7d8aa1488f6a4340.tar.gz volse-hubzilla-513175982367a970d491948f7d8aa1488f6a4340.tar.bz2 volse-hubzilla-513175982367a970d491948f7d8aa1488f6a4340.zip | |
Merge remote-tracking branch 'upstream/dev' into website-import
Diffstat (limited to 'include/security.php')
| -rw-r--r-- | include/security.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/security.php b/include/security.php index 38045c8a9..212690d91 100644 --- a/include/security.php +++ b/include/security.php @@ -125,13 +125,17 @@ 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)); } if(! is_dir('store/' . $r[0]['channel_address'])) @os_mkdir('store/' . $r[0]['channel_address'], STORAGE_DEFAULT_PERMISSIONS,true); + + $arr = [ 'channel_id' => $change_channel, 'chanx' => $ret ]; + call_hooks('change_channel', $arr); + } return $ret; |