From ce0bdc7eb0a547ac2629b2dee4c7a89ea2453f90 Mon Sep 17 00:00:00 2001
From: Jonathan Pugh <jon@careernerd.com>
Date: Wed, 16 Mar 2011 11:39:02 -0400
Subject: [PATCH] Issue #1071330 by careernerd: user save on login destroys data

---
 remember_me.module |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/remember_me.module b/remember_me.module
index 959bb4f..c36f614 100644
--- a/remember_me.module
+++ b/remember_me.module
@@ -57,11 +57,9 @@ function _remember_me_set_lifetime($cookie_lifetime) {
 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);
-    user_save($account, array(
-      'data' => array ('remember_me' => (bool) $remember_me),
-        ), NULL);
-      }
+    $account->data = array_merge($account->data, array('remember_me' => (bool) $remember_me));
+    user_save($account, (array) $account, NULL);
+  }
 
   // TODO: not tested if this still works
     if (variable_get('remember_me_phantom_session', 0)) {
-- 
1.7.1