aboutsummaryrefslogtreecommitdiffstats
path: root/include/Contact.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-03-13 21:19:33 +0100
committerMario Vavti <mario@mariovavti.com>2016-03-13 21:19:33 +0100
commita8d5c832515581ef1f2c128e43c03b77d3151014 (patch)
treed086123b9fa1539f9bdb305285aeb897a2c2eb60 /include/Contact.php
parent370a007ee215d2889d9bf760b0247678c08d31ac (diff)
parent7747a23a7895bfa2aac0b95604ea42dab6630079 (diff)
downloadvolse-hubzilla-a8d5c832515581ef1f2c128e43c03b77d3151014.tar.gz
volse-hubzilla-a8d5c832515581ef1f2c128e43c03b77d3151014.tar.bz2
volse-hubzilla-a8d5c832515581ef1f2c128e43c03b77d3151014.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla
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());
}