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 /include/auth.php | |
| 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 'include/auth.php')
| -rw-r--r-- | include/auth.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/include/auth.php b/include/auth.php index 844566919..c44eeb8fc 100644 --- a/include/auth.php +++ b/include/auth.php @@ -145,8 +145,17 @@ if((isset($_SESSION)) && (x($_SESSION, 'authenticated')) && // process logout request $args = array('channel_id' => local_channel()); call_hooks('logging_out', $args); - App::$session->nuke(); - info( t('Logged out.') . EOL); + + + if($_SESSION['delegate'] && $_SESSION['delegate_push']) { + $_SESSION = $_SESSION['delegate_push']; + info( t('Delegation session ended.') . EOL); + } + else { + App::$session->nuke(); + info( t('Logged out.') . EOL); + } + goaway(z_root()); } |