mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 21:57:51 +02:00
Code Issues Releases Wiki Activity

fix parse error on front-end logout (when main admin in 'login as' state)

Browse Source
This commit is contained in:
secretr
2012-06-15 11:30:37 +00:00
parent c898921631
commit 8da6fd2ed2
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
class2.php
View File

@@ -846,14 +846,16 @@ if (($_SERVER['QUERY_STRING'] == 'logout')/* || (($pref['user_tracking'] == 'ses
// earlier event trigger with user data still available // earlier event trigger with user data still available
e107::getEvent()->trigger('logout'); e107::getEvent()->trigger('logout');
// first model logout and session destroy..
e107::getUser()->logout();
// it might be removed soon
if ($pref['user_tracking'] == 'session') if ($pref['user_tracking'] == 'session')
{ {
session_destroy(); session_destroy();
$_SESSION[e_COOKIE]=''; $_SESSION[e_COOKIE]='';
} }
cookie(e_COOKIE, '', (time() - 2592000)); cookie(e_COOKIE, '', (time() - 2592000));
e107::getUser()->logout();
e107::getRedirect()->redirect(SITEURL); e107::getRedirect()->redirect(SITEURL);
// header('location:'.e_BASE.'index.php'); // header('location:'.e_BASE.'index.php');

1
e107_handlers/user_model.php
View File

@@ -1105,6 +1105,7 @@ class e_user extends e_user_model
$this->_extended_model = $this->_parent_extmodel; $this->_extended_model = $this->_parent_extmodel;
$this->_extended_structure = $this->_parent_extstruct; $this->_extended_structure = $this->_parent_extstruct;
$this->_user_config = $this->_parent_config; $this->_user_config = $this->_parent_config;
if($this->_parent_model)
$this->setData($this->_parent_model->getData()); $this->setData($this->_parent_model->getData());
// cleanup // cleanup