diff --git a/.gitignore b/.gitignore index 56e49623..0cf55168 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,10 @@ templates/* images/guilds/* !images/guilds/default.gif +# editor images +images/editor/* +!images/editor/index.html + # cache system/cache/* !system/cache/index.html @@ -51,9 +55,5 @@ plugins/* !plugins/account-create-hint landing -# user data -user/* -!user/index.html - # others/rest system/pages/downloads.php diff --git a/system/login.php b/system/login.php index 330efd13..cdf4c3a8 100644 --- a/system/login.php +++ b/system/login.php @@ -35,7 +35,7 @@ if($current_session !== false) if(ACTION === 'logout' && !isset($_REQUEST['account_login'])) { if(isset($account_logged) && $account_logged->isLoaded()) { - if($hooks->trigger(HOOK_LOGOUT, array('account' => $account_logged, 'password' => getSession('password')))) { + if($hooks->trigger(HOOK_LOGOUT,['account_id' => $account_logged->getId()])) { unsetSession('account'); unsetSession('password'); unsetSession('remember_me');