diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-04-12 14:46:36 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-04-12 14:46:36 +0200 |
| commit | 7c47b9d75ca02ce46175ee3bc0b54e27e8061621 (patch) | |
| tree | ba7b1a6be60040f31e099e1cd30849b50a3ba1ae /Zotlabs | |
| parent | 09a8b4b379d91dd62f38c116c99187a404d7e774 (diff) | |
| parent | 549f7a53b11d014993fbb550de97b6cdf45e0843 (diff) | |
| download | volse-hubzilla-7c47b9d75ca02ce46175ee3bc0b54e27e8061621.tar.gz volse-hubzilla-7c47b9d75ca02ce46175ee3bc0b54e27e8061621.tar.bz2 volse-hubzilla-7c47b9d75ca02ce46175ee3bc0b54e27e8061621.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Logout.php | 7 | ||||
| -rw-r--r-- | Zotlabs/Module/Magic.php | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Zotlabs/Module/Logout.php b/Zotlabs/Module/Logout.php index f06e7278b..d11ce54ac 100644 --- a/Zotlabs/Module/Logout.php +++ b/Zotlabs/Module/Logout.php @@ -5,7 +5,12 @@ namespace Zotlabs\Module; class Logout extends \Zotlabs\Web\Controller { function init() { - \App::$session->nuke(); + if($_SESSION['delegate'] && $_SESSION['delegate_push']) { + $_SESSION = $_SESSION['delegate_push']; + } + else { + \App::$session->nuke(); + } goaway(z_root()); } diff --git a/Zotlabs/Module/Magic.php b/Zotlabs/Module/Magic.php index 15e5cedcf..4b3a223ba 100644 --- a/Zotlabs/Module/Magic.php +++ b/Zotlabs/Module/Magic.php @@ -112,6 +112,8 @@ class Magic extends \Zotlabs\Web\Controller { if($r && intval($r[0]['channel_id'])) { $allowed = perm_is_allowed($r[0]['channel_id'],get_observer_hash(),'delegate'); if($allowed) { + $tmp = $_SESSION; + $_SESSION['delegate_push'] = $tmp; $_SESSION['delegate_channel'] = $r[0]['channel_id']; $_SESSION['delegate'] = get_observer_hash(); $_SESSION['account_id'] = intval($r[0]['channel_account_id']); |