Index: remember_me/remember_me.module =================================================================== --- remember_me/remember_me.module (revision 17655) +++ remember_me/remember_me.module (working copy) @@ -15,13 +15,13 @@ // If we have a user logged in, then we have a session. if ($user->uid) { - if ($user->data['remember_me'] && variable_get('remember_me_managed', 0) != 0) { + if (isset($user->data['remember_me']) && $user->data['remember_me'] && variable_get('remember_me_managed', 0) != 0) { // Set lifetime as configured via admin settings. if (variable_get('remember_me_lifetime', 604800) != ini_get('session.cookie_lifetime')) { _remember_me_set_lifetime(variable_get('remember_me_lifetime', 604800)); } } - elseif (!$user->data['remember_me']) { + elseif (!isset($user->data['remember_me']) || !$user->data['remember_me']) { // If we have cookie lifetime set already then unset it. if (0 != ini_get('session.cookie_lifetime')) { _remember_me_set_lifetime(0); @@ -58,10 +58,12 @@ function remember_me_user_login(&$edit, $account) { $remember_me = isset($edit['input']['remember_me']) ? $edit['input']['remember_me'] : false; if ($account->uid) { - var_dump ($remember_me); + // TODO: why was this done? If we enable it, we destroy user data + /* user_save($account, array( 'data' => array ('remember_me' => (bool) $remember_me), ), NULL); + */ } // TODO: not tested if this still works