aboutsummaryrefslogtreecommitdiffstats
path: root/include/Contact.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-03-12 19:53:07 -0800
committerredmatrix <git@macgirvin.com>2016-03-12 19:53:07 -0800
commitcc29e27acc04511b943c5dcab85b1ce215ac2e49 (patch)
tree4861ff715cec11a22e1c8e8b207b3a2460c714e0 /include/Contact.php
parent70ad69d38c53f78d04d912495f63c6fb781f0550 (diff)
downloadvolse-hubzilla-cc29e27acc04511b943c5dcab85b1ce215ac2e49.tar.gz
volse-hubzilla-cc29e27acc04511b943c5dcab85b1ce215ac2e49.tar.bz2
volse-hubzilla-cc29e27acc04511b943c5dcab85b1ce215ac2e49.zip
issue #320 - regression, after removing channel attached to an authenticated session the session was not completely cleared.
Diffstat (limited to 'include/Contact.php')
-rw-r--r--include/Contact.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/Contact.php b/include/Contact.php
index 611371db6..1c61470e1 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -263,7 +263,7 @@ function rrmdir($path)
return false;
}
-function channel_remove($channel_id, $local = true, $unset_session=true) {
+function channel_remove($channel_id, $local = true, $unset_session=false) {
if(! $channel_id)
return;
@@ -389,8 +389,7 @@ function channel_remove($channel_id, $local = true, $unset_session=true) {
proc_run('php','include/directory.php',$channel_id);
if($channel_id == local_channel() && $unset_session) {
- unset($_SESSION['authenticated']);
- unset($_SESSION['uid']);
+ nuke_session();
goaway($a->get_baseurl());
}