diff options
Diffstat (limited to 'modules/user')
| -rw-r--r-- | modules/user/user.module | 4 | ||||
| -rw-r--r-- | modules/user/user.pages.inc | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/modules/user/user.module b/modules/user/user.module index 1ba829a0b..9ebd469a1 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -238,10 +238,6 @@ class UserController extends DrupalDefaultEntityController { $picture_fids = array(); foreach ($queried_users as $key => $record) { $picture_fids[] = $record->picture; - $queried_users[$key] = drupal_unpack($record); - // As well as unpacking $user->data, also convert the property to an - // unserialized array. This ensures we can always safely reserialize it - // in user_save(). $queried_users[$key]->data = unserialize($record->data); $queried_users[$key]->roles = array(); if ($record->uid) { diff --git a/modules/user/user.pages.inc b/modules/user/user.pages.inc index 7f40eadd6..1a5dfe227 100644 --- a/modules/user/user.pages.inc +++ b/modules/user/user.pages.inc @@ -495,13 +495,13 @@ function user_cancel_confirm($account, $timestamp = 0, $hashed_pass = '') { $current = REQUEST_TIME; // Basic validation of arguments. - if (isset($account->user_cancel_method) && !empty($timestamp) && !empty($hashed_pass)) { + if (isset($account->data['user_cancel_method']) && !empty($timestamp) && !empty($hashed_pass)) { // Validate expiration and hashed password/login. if ($timestamp <= $current && $current - $timestamp < $timeout && $account->uid && $timestamp >= $account->login && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login)) { $edit = array( - 'user_cancel_notify' => isset($account->user_cancel_notify) ? $account->user_cancel_notify : variable_get('user_mail_status_canceled_notify', FALSE), + 'user_cancel_notify' => isset($account->data['user_cancel_notify']) ? $account->data['user_cancel_notify'] : variable_get('user_mail_status_canceled_notify', FALSE), ); - user_cancel($edit, $account->uid, $account->user_cancel_method); + user_cancel($edit, $account->uid, $account->data['user_cancel_method']); // Since user_cancel() is not invoked via Form API, batch processing needs // to be invoked manually and should redirect to the front page after // completion. |