summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modules/comment/comment.module6
-rw-r--r--modules/dblog/dblog.test2
-rw-r--r--modules/node/node.module4
-rw-r--r--modules/node/node.pages.inc4
-rw-r--r--modules/profile/profile.module22
-rw-r--r--modules/profile/profile.pages.inc15
-rw-r--r--modules/simpletest/drupal_web_test_case.php2
-rw-r--r--modules/simpletest/tests/file.test2
-rw-r--r--modules/statistics/statistics.pages.inc2
-rw-r--r--modules/system/system.module2
-rw-r--r--modules/trigger/trigger.module4
-rw-r--r--modules/update/update.fetch.inc2
-rw-r--r--modules/user/user.api.php19
-rw-r--r--modules/user/user.module241
-rw-r--r--modules/user/user.pages.inc9
-rw-r--r--modules/user/user.test50
16 files changed, 263 insertions, 123 deletions
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 177518c34..71b3ea219 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -1283,7 +1283,7 @@ function comment_validate($edit) {
form_set_error('date', t('You have to specify a valid date.'));
}
}
- if (isset($edit['author']) && !$account = user_load(array('name' => $edit['author']))) {
+ if (isset($edit['author']) && !$account = user_load_by_name($edit['author'])) {
form_set_error('author', t('You have to specify a valid author.'));
}
@@ -1607,7 +1607,7 @@ function comment_form_add_preview($form, &$form_state) {
// Attach the user and time information.
if (!empty($edit['author'])) {
- $account = user_load(array('name' => $edit['author']));
+ $account = user_load_by_name($edit['author']);
}
elseif ($user->uid && !isset($edit['is_anonymous'])) {
$account = $user;
@@ -1687,7 +1687,7 @@ function _comment_form_submit(&$comment_values) {
$comment_values['timestamp'] = strtotime($comment_values['date']);
if (isset($comment_values['author'])) {
- $account = user_load(array('name' => $comment_values['author']));
+ $account = user_load_by_name($comment_values['author']);
$comment_values['uid'] = $account->uid;
$comment_values['name'] = $comment_values['author'];
}
diff --git a/modules/dblog/dblog.test b/modules/dblog/dblog.test
index 6704e0167..3022586e8 100644
--- a/modules/dblog/dblog.test
+++ b/modules/dblog/dblog.test
@@ -188,7 +188,7 @@ class DBLogTestCase extends DrupalWebTestCase {
$this->drupalPost('admin/user/user/create', $edit, t('Create new account'));
$this->assertResponse(200);
// Retrieve user object.
- $user = user_load(array('name' => $name)); //, 'pass' => $pass, 'status' => 1));
+ $user = user_load_by_name($name);
$this->assertTrue($user != null, t('User @name was loaded', array('@name' => $name)));
$user->pass_raw = $pass; // Needed by drupalLogin.
// Login user.
diff --git a/modules/node/node.module b/modules/node/node.module
index a83cfbdc5..1772759e7 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -984,7 +984,7 @@ function node_validate($node, $form = array()) {
if (user_access('administer nodes')) {
// Validate the "authored by" field.
- if (!empty($node->name) && !($account = user_load(array('name' => $node->name)))) {
+ if (!empty($node->name) && !($account = user_load_by_name($node->name))) {
// The use of empty() is mandatory in the context of usernames
// as the empty string denotes the anonymous user. In case we
// are dealing with an anonymous user we set the user ID to 0.
@@ -1035,7 +1035,7 @@ function node_submit($node) {
if (user_access('administer nodes')) {
// Populate the "authored by" field.
- if ($account = user_load(array('name' => $node->name))) {
+ if ($account = user_load_by_name($node->name)) {
$node->uid = $account->uid;
}
else {
diff --git a/modules/node/node.pages.inc b/modules/node/node.pages.inc
index 06fc66988..e0481e0fe 100644
--- a/modules/node/node.pages.inc
+++ b/modules/node/node.pages.inc
@@ -353,7 +353,7 @@ function node_preview($node) {
if (isset($node->name)) {
// The use of isset() is mandatory in the context of user IDs, because
// user ID 0 denotes the anonymous user.
- if ($user = user_load(array('name' => $node->name))) {
+ if ($user = user_load_by_name($node->name)) {
$node->uid = $user->uid;
$node->picture = $user->picture;
}
@@ -362,7 +362,7 @@ function node_preview($node) {
}
}
elseif ($node->uid) {
- $user = user_load(array('uid' => $node->uid));
+ $user = user_load($node->uid);
$node->name = $user->name;
$node->picture = $user->picture;
}
diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index e915a97ad..e4d3ab08f 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -203,13 +203,6 @@ function profile_block_view($delta = '') {
}
/**
- * Implementation of hook_user_load().
- */
-function profile_user_load(&$edit, &$user, $category = NULL) {
- return profile_load_profile($user);
-}
-
-/**
* Implementation of hook_user_register().
*/
function profile_user_register(&$edit, &$user, $category = NULL) {
@@ -270,11 +263,14 @@ function profile_user_cancel(&$edit, &$account, $method) {
}
}
-function profile_load_profile(&$user) {
- $result = db_query('SELECT f.name, f.type, v.value FROM {profile_field} f INNER JOIN {profile_value} v ON f.fid = v.fid WHERE uid = %d', $user->uid);
- while ($field = db_fetch_object($result)) {
- if (empty($user->{$field->name})) {
- $user->{$field->name} = _profile_field_serialize($field->type) ? unserialize($field->value) : $field->value;
+/**
+ * Implementation of hook_user_load().
+ */
+function profile_user_load($users) {
+ $result = db_query('SELECT f.name, f.type, v.uid, v.value FROM {profile_field} f INNER JOIN {profile_value} v ON f.fid = v.fid WHERE uid IN (:uids)', array(':uids' => array_keys($users)));
+ foreach ($result as $record) {
+ if (empty($users[$record->uid]->{$record->name})) {
+ $users[$record->uid]->{$record->name} = _profile_field_serialize($record->type) ? unserialize($record->value) : $record->value;
}
}
}
@@ -341,7 +337,7 @@ function profile_view_field($user, $field) {
function profile_view_profile(&$user) {
- profile_load_profile($user);
+ $user = user_load($user->uid);
// Show private fields to administrators and people viewing their own account.
if (user_access('administer users') || $GLOBALS['user']->uid == $user->uid) {
diff --git a/modules/profile/profile.pages.inc b/modules/profile/profile.pages.inc
index 9cb761a28..e1e01d9e0 100644
--- a/modules/profile/profile.pages.inc
+++ b/modules/profile/profile.pages.inc
@@ -55,11 +55,13 @@ function profile_browse() {
}
// Extract the affected users:
- $result = pager_query("SELECT u.uid, u.access FROM {users} u INNER JOIN {profile_value} v ON u.uid = v.uid WHERE v.fid = %d AND $query AND u.access != 0 AND u.status != 0 ORDER BY u.access DESC", 20, 0, NULL, $arguments);
+ $result = pager_query("SELECT u.uid, u.access FROM {users} u INNER JOIN {profile_value} v ON u.uid = v.uid WHERE v.fid = %d AND $query AND u.access != 0 AND u.status != 0 ORDER BY u.access DESC", 20, 0, NULL, $arguments)->fetchAllAssoc('uid');
+
+ // Load the users.
+ $users = user_load_multiple(array_keys($result));
$content = '';
- while ($account = db_fetch_object($result)) {
- $account = user_load(array('uid' => $account->uid));
+ foreach ($users as $account) {
$profile = _profile_update_user_fields($fields, $account);
$content .= theme('profile_listing', $account, $profile);
}
@@ -88,11 +90,10 @@ function profile_browse() {
}
// Extract the affected users:
- $result = pager_query('SELECT uid, access FROM {users} WHERE uid > 0 AND status != 0 AND access != 0 ORDER BY access DESC', 20, 0, NULL);
-
+ $result = pager_query('SELECT uid, access FROM {users} WHERE uid > 0 AND status != 0 AND access != 0 ORDER BY access DESC', 20, 0, NULL)->fetchAllAssoc('uid');
+ $users = user_load_multiple(array_keys($result));
$content = '';
- while ($account = db_fetch_object($result)) {
- $account = user_load(array('uid' => $account->uid));
+ foreach ($users as $account) {
$profile = _profile_update_user_fields($fields, $account);
$content .= theme('profile_listing', $account, $profile);
}
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index 6033638b2..11212e760 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/modules/simpletest/drupal_web_test_case.php
@@ -849,7 +849,7 @@ class DrupalWebTestCase {
// Log in with a clean $user.
$this->originalUser = $user;
drupal_save_session(FALSE);
- $user = user_load(array('uid' => 1));
+ $user = user_load(1);
// Restore necessary variables.
variable_set('install_profile', 'default');
diff --git a/modules/simpletest/tests/file.test b/modules/simpletest/tests/file.test
index 09a75b78e..c0dcb7ad1 100644
--- a/modules/simpletest/tests/file.test
+++ b/modules/simpletest/tests/file.test
@@ -434,7 +434,7 @@ class FileValidatorTest extends DrupalWebTestCase {
drupal_save_session(FALSE);
// Run these test as uid = 1.
- $user = user_load(array('uid' => 1));
+ $user = user_load(1);
$file = new stdClass();
$file->filesize = 999999;
diff --git a/modules/statistics/statistics.pages.inc b/modules/statistics/statistics.pages.inc
index 612a03f34..cb1a43612 100644
--- a/modules/statistics/statistics.pages.inc
+++ b/modules/statistics/statistics.pages.inc
@@ -40,7 +40,7 @@ function statistics_node_tracker() {
}
function statistics_user_tracker() {
- if ($account = user_load(array('uid' => arg(1)))) {
+ if ($account = user_load(arg(1))) {
$header = array(
array('data' => t('Timestamp'), 'field' => 'timestamp', 'sort' => 'desc'),
diff --git a/modules/system/system.module b/modules/system/system.module
index 7f259ad87..c2e33fb19 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -2013,7 +2013,7 @@ function system_send_email_action($object, $context) {
if (isset($node)) {
if (!isset($account)) {
- $account = user_load(array('uid' => $node->uid));
+ $account = user_load($node->uid);
}
if ($recipient == '%author') {
$recipient = $account->mail;
diff --git a/modules/trigger/trigger.module b/modules/trigger/trigger.module
index 6df47e686..aeb5bb0fd 100644
--- a/modules/trigger/trigger.module
+++ b/modules/trigger/trigger.module
@@ -195,7 +195,7 @@ function _trigger_normalize_node_context($type, $node) {
// An action that works on users is being called in a node context.
// Load the user object of the node's author.
case 'user':
- return user_load(array('uid' => $node->uid));
+ return user_load($node->uid);
}
}
@@ -298,7 +298,7 @@ function _trigger_normalize_comment_context($type, $comment) {
// An action that works on users is being called in a comment context.
case 'user':
- return user_load(array('uid' => is_array($comment) ? $comment['uid'] : $comment->uid));
+ return user_load(is_array($comment) ? $comment['uid'] : $comment->uid);
}
}
diff --git a/modules/update/update.fetch.inc b/modules/update/update.fetch.inc
index adae8c36c..19b5d4957 100644
--- a/modules/update/update.fetch.inc
+++ b/modules/update/update.fetch.inc
@@ -121,7 +121,7 @@ function _update_cron_notify() {
if (!empty($notify_list)) {
$default_language = language_default();
foreach ($notify_list as $target) {
- if ($target_user = user_load(array('mail' => $target))) {
+ if ($target_user = user_load_by_mail($target)) {
$target_language = user_preferred_language($target_user);
}
else {
diff --git a/modules/user/user.api.php b/modules/user/user.api.php
index 4d7feef77..6e3515d3b 100644
--- a/modules/user/user.api.php
+++ b/modules/user/user.api.php
@@ -84,6 +84,25 @@ function hook_user($op, &$edit, &$account, $category = NULL) {
return $form;
}
}
+/**
+ * Act on user objects when loaded from the database.
+ *
+ * Due to the static cache in user_load_multiple() you should not use this
+ * hook to modify the user properties returned by the {users} table itself
+ * since this may result in unreliable results when loading from cache.
+ *
+ * @param $users
+ * An array of user objects, indexed by uid.
+ *
+ * @see user_load_multiple()
+ * @see profile_user_load()
+ */
+function hook_user_load($users) {
+ $result = db_query('SELECT * FROM {my_table} WHERE uid IN (:uids)', array(':uids' => array_keys($users)));
+ foreach ($result as $record) {
+ $users[$record->uid]->foo = $result->foo;
+ }
+}
/**
* Act on user account cancellations.
diff --git a/modules/user/user.module b/modules/user/user.module
index 76fd2834d..d63f27cbd 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -160,77 +160,191 @@ function user_external_login($account, $edit = array()) {
}
/**
- * Fetch a user object.
+ * Load multiple users based on certain conditions.
*
- * @param $array
- * An associative array of attributes to search for in selecting the
- * user, such as user name or e-mail address.
+ * This function should be used whenever you need to load more than one user
+ * from the database. Users are loaded into memory and will not require
+ * database access if loaded again during the same page request.
*
+ * @param $uids
+ * An array of user IDs.
+ * @param $conditions
+ * An array of conditions to match against the {users} table. These
+ * should be supplied in the form array('field_name' => 'field_value').
+ * @param $reset
+ * A boolean indicating that the internal cache should be reset. Use this if
+ * loading a user object which has been altered during the page request.
* @return
- * A fully-loaded $user object upon successful user load or FALSE if user
- * cannot be loaded.
+ * An array of user objects, indexed by uid.
+ *
+ * @see user_load()
+ * @see user_load_by_mail()
+ * @see user_load_by_name()
*/
-function user_load($array = array()) {
- // Dynamically compose a SQL query:
- $query = array();
- $params = array();
-
- if (is_numeric($array)) {
- $array = array('uid' => $array);
- }
- elseif (!is_array($array)) {
- return FALSE;
+function user_load_multiple($uids = array(), $conditions = array(), $reset = FALSE) {
+ static $user_cache = array();
+ if ($reset) {
+ $user_cache = array();
}
- foreach ($array as $key => $value) {
- if ($key == 'uid' || $key == 'status') {
- $query[] = "$key = %d";
- $params[] = $value;
- }
- elseif ($key == 'pass') {
- $query[] = "pass = '%s'";
- $params[] = $value;
- }
- else {
- $query[]= "LOWER($key) = LOWER('%s')";
- $params[] = $value;
+ $users = array();
+
+ // Create a new variable which is either a prepared version of the $uids
+ // array for later comparison with the user cache, or FALSE if no $uids were
+ // passed. The $uids array is reduced as items are loaded from cache, and we
+ // need to know if it's empty for this reason to avoid querying the database
+ // when all requested users are loaded from cache.
+ $passed_uids = !empty($uids) ? array_flip($uids) : FALSE;
+
+ // Load any available users from the internal cache.
+ if ($user_cache) {
+ if ($uids && !$conditions) {
+ $users += array_intersect_key($user_cache, $passed_uids);
+ // If any users were loaded, remove them from the $uids still to load.
+ $uids = array_keys(array_diff_key($passed_uids, $users));
}
}
- $result = db_query('SELECT * FROM {users} u WHERE ' . implode(' AND ', $query), $params);
- if ($user = db_fetch_object($result)) {
- $user = drupal_unpack($user);
+ // Load any remaining users from the database, this is necessary if we have
+ // $uids still to load, or if $conditions was passed without $uids.
+ if ($uids || ($conditions && !$passed_uids)) {
+ $query = db_select('users', 'u')->fields('u');
- $user->roles = array();
- if ($user->uid) {
- $user->roles[DRUPAL_AUTHENTICATED_RID] = 'authenticated user';
+ // If the $uids array is populated, add those to the query.
+ if ($uids) {
+ $query->condition('u.uid', $uids, 'IN');
}
- else {
- $user->roles[DRUPAL_ANONYMOUS_RID] = 'anonymous user';
+ // If the conditions array is populated, add those to the query.
+ if ($conditions) {
+ // TODO D7: Using LIKE() to get a case insensitive comparison because Crell
+ // and chx promise that dbtng will map it to ILIKE in postgres.
+ if (isset($conditions['name'])) {
+ $query->condition('u.name', $conditions['name'], 'LIKE');
+ unset($conditions['name']);
+ }
+ if (isset($conditions['mail'])) {
+ $query->condition('u.mail', $conditions['mail'], 'LIKE');
+ unset($conditions['mail']);
+ }
+ foreach ($conditions as $field => $value) {
+ $query->condition('u.' . $field, $value);
+ }
}
- $result = db_query('SELECT r.rid, r.name FROM {role} r INNER JOIN {users_roles} ur ON ur.rid = r.rid WHERE ur.uid = %d', $user->uid);
- while ($role = db_fetch_object($result)) {
- $user->roles[$role->rid] = $role->name;
+ $result = $query->execute();
+
+ $queried_users = array();
+ // Build an array of user picture IDs so that these can be fetched later.
+ $picture_fids = array();
+ foreach ($result as $record) {
+ $picture_fids[] = $record->picture;
+ $queried_users[$record->uid] = drupal_unpack($record);
+ $queried_users[$record->uid]->roles = array();
+ if ($record->uid) {
+ $queried_users[$record->uid]->roles[DRUPAL_AUTHENTICATED_RID] = 'authenticated user';
+ }
+ else {
+ $queried_users[$record->uid]->roles[DRUPAL_ANONYMOUS_RID] = 'anonymous user';
+ }
}
- // Attach fields.
- // TODO D7 : not sure the 3rd param ($types) is needed.
- field_attach_load('user', array($user->uid => $user));
+ if (!empty($queried_users)) {
+ // Add any additional roles from the database.
+ $result = db_query('SELECT r.rid, r.name, ur.uid FROM {role} r INNER JOIN {users_roles} ur ON ur.rid = r.rid WHERE ur.uid IN (:uids)', array(':uids' => array_keys($queried_users)));
+ foreach ($result as $record) {
+ $queried_users[$record->uid]->roles[$record->rid] = $record->name;
+ }
- if (!empty($user->picture) && ($file = file_load($user->picture))) {
- $user->picture = $file;
- }
- else {
- $user->picture = NULL;
- }
+ // Add the full file objects for user pictures if enabled.
+ if (!empty($picture_fids) && variable_get('user_pictures', 1) == 1) {
+ $pictures = file_load_multiple($picture_fids);
+ foreach ($queried_users as $account) {
+ if (!empty($account->picture) && isset($pictures[$account->picture])) {
+ $account->picture = $pictures[$account->picture];
+ }
+ else {
+ $account->picture = NULL;
+ }
+ }
+ }
+
+ // Invoke hook_user_load() on the users loaded from the database
+ // and add them to the static cache.
+ foreach (module_implements('user_load') as $module) {
+ $function = $module . '_user_load';
+ $function($queried_users);
+ }
- user_module_invoke('load', $array, $user);
+ // TODO D7 : not sure the 3rd param ($types) is needed.
+ field_attach_load('user', $queried_users);
+
+ $users = $users + $queried_users;
+ $user_cache = $user_cache + $queried_users;
+ }
}
- else {
- $user = FALSE;
+
+ // Ensure that the returned array is ordered the same as the original $uids
+ // array if this was passed in and remove any invalid uids.
+ if ($passed_uids) {
+ // Remove any invalid uids from the array.
+ $passed_uids = array_intersect_key($passed_uids, $users);
+ foreach ($users as $user) {
+ $passed_uids[$user->uid] = $user;
+ }
+ $users = $passed_uids;
}
- return $user;
+ return $users;
+}
+
+
+/**
+ * Fetch a user object.
+ *
+ * @param $uid
+ * Integer specifying the user id.
+ * @param $reset
+ * A boolean indicating that the internal cache should be reset.
+ * @return
+ * A fully-loaded $user object upon successful user load or FALSE if user
+ * cannot be loaded.
+ *
+ * @see user_load_multiple()
+ */
+function user_load($uid, $reset = FALSE) {
+ $users = user_load_multiple(array($uid), array(), $reset);
+ return reset($users);
+}
+
+/**
+ * Fetch a user object by email address.
+ *
+ * @param $mail
+ * String with the account's e-mail address.
+ * @return
+ * A fully-loaded $user object upon successful user load or FALSE if user
+ * cannot be loaded.
+ *
+ * @see user_load_multiple()
+ */
+function user_load_by_mail($mail) {
+ $users = user_load_multiple(array(), array('mail' => $mail));
+ return reset($users);
+}
+
+/**
+ * Fetch a user object by account name.
+ *
+ * @param $name
+ * String with the account's user name.
+ * @return
+ * A fully-loaded $user object upon successful user load or FALSE if user
+ * cannot be loaded.
+ *
+ * @see user_load_multiple()
+ */
+function user_load_by_name($name) {
+ $users = user_load_multiple(array(), array('name' => $name));
+ return reset($users);
}
/**
@@ -374,7 +488,7 @@ function user_save($account, $edit = array(), $category = 'account') {
field_attach_update('user', $obj);
// Refresh user object.
- $user = user_load(array('uid' => $account->uid));
+ $user = user_load($account->uid, TRUE);
// Send emails after we have the new user object.
if (isset($edit['status']) && $edit['status'] != $account->status) {
@@ -404,7 +518,7 @@ function user_save($account, $edit = array(), $category = 'account') {
}
// Build the initial user object.
- $user = user_load(array('uid' => $edit['uid']));
+ $user = user_load($edit['uid'], TRUE);
$obj = (object) $edit;
field_attach_insert('user', $obj);
@@ -438,7 +552,7 @@ function user_save($account, $edit = array(), $category = 'account') {
}
// Build the finished user object.
- $user = user_load(array('uid' => $edit['uid']));
+ $user = user_load($edit['uid'], TRUE);
}
return $user;
@@ -1291,7 +1405,6 @@ function user_menu() {
'access callback' => 'user_edit_access',
'access arguments' => array(1),
'type' => MENU_LOCAL_TASK,
- 'load arguments' => array('%map', '%index'),
);
$items['user/%user_category/edit/account'] = array(
@@ -1554,8 +1667,8 @@ function user_authenticate($form_values = array()) {
db_query("UPDATE {users} SET pass = '%s' WHERE uid = %d", $new_hash, $account->uid);
}
}
- $account = user_load(array('uid' => $account->uid, 'status' => 1));
- $user = $account;
+ $users = user_load_multiple(array($account->uid), array('status' => '1'));
+ $user = reset($users);
user_authenticate_finalize($form_values);
return $user;
}
@@ -1608,7 +1721,7 @@ function user_login_submit($form, &$form_state) {
function user_external_login_register($name, $module) {
global $user;
- $existing_user = user_load(array('name' => $name));
+ $existing_user = user_load_by_name($name);
if (isset($existing_user->uid)) {
$user = $existing_user;
}
@@ -1799,7 +1912,7 @@ function user_edit_form(&$form_state, $uid, $edit, $register = FALSE) {
function user_cancel($edit, $uid, $method) {
global $user;
- $account = user_load(array('uid' => $uid));
+ $account = user_load($uid);
if (!$account) {
drupal_set_message(t('The user account %id does not exist.', array('%id' => $uid)), 'error');
@@ -2110,7 +2223,7 @@ function user_user_operations($form_state = array()) {
*/
function user_user_operations_unblock($accounts) {
foreach ($accounts as $uid) {
- $account = user_load(array('uid' => (int)$uid));
+ $account = user_load($uid);
// Skip unblocking user if they are already unblocked.
if ($account !== FALSE && $account->status == 0) {
user_save($account, array('status' => 1));
@@ -2123,7 +2236,7 @@ function user_user_operations_unblock($accounts) {
*/
function user_user_operations_block($accounts) {
foreach ($accounts as $uid) {
- $account = user_load(array('uid' => (int)$uid));
+ $account = user_load($uid);
// Skip blocking user if they are already blocked.
if ($account !== FALSE && $account->status == 1) {
user_save($account, array('status' => 0));
@@ -2142,7 +2255,7 @@ function user_multiple_role_edit($accounts, $operation, $rid) {
switch ($operation) {
case 'add_role':
foreach ($accounts as $uid) {
- $account = user_load(array('uid' => (int)$uid));
+ $account = user_load($uid);
// Skip adding the role to the user if they already have it.
if ($account !== FALSE && !isset($account->roles[$rid])) {
$roles = $account->roles + array($rid => $role_name);
@@ -2152,7 +2265,7 @@ function user_multiple_role_edit($accounts, $operation, $rid) {
break;
case 'remove_role':
foreach ($accounts as $uid) {
- $account = user_load(array('uid' => (int)$uid));
+ $account = user_load($uid);
// Skip removing the role from the user if they already don't have it.
if ($account !== FALSE && isset($account->roles[$rid])) {
$roles = array_diff($account->roles, array($rid => $role_name));
diff --git a/modules/user/user.pages.inc b/modules/user/user.pages.inc
index 581ac683a..f1fb2f42d 100644
--- a/modules/user/user.pages.inc
+++ b/modules/user/user.pages.inc
@@ -44,10 +44,12 @@ function user_pass() {
function user_pass_validate($form, &$form_state) {
$name = trim($form_state['values']['name']);
// Try to load by email.
- $account = user_load(array('mail' => $name, 'status' => 1));
+ $users = user_load_multiple(array(), array('mail' => $name, 'status' => '1'));
+ $account = reset($users);
if (!$account) {
// No success, try to load by name.
- $account = user_load(array('name' => $name, 'status' => 1));
+ $users = user_load_multiple(array(), array('name' => $name, 'status' => '1'));
+ $account = reset($users);
}
if (isset($account->uid)) {
form_set_value(array('#parents' => array('account')), $account, $form_state);
@@ -86,7 +88,8 @@ function user_pass_reset(&$form_state, $uid, $timestamp, $hashed_pass, $action =
$timeout = 86400;
$current = REQUEST_TIME;
// Some redundant checks for extra security ?
- if ($timestamp < $current && $account = user_load(array('uid' => $uid, 'status' => 1)) ) {
+ $users = user_load_multiple(array($uid), array('status' => '1'));
+ if ($timestamp < $current && $account = reset($users)) {
// No time out for first time login.
if ($account->login && $current - $timestamp > $timeout) {
drupal_set_message(t('You have tried to use a one-time login link that has expired. Please request a new one using the form below.'));
diff --git a/modules/user/user.test b/modules/user/user.test
index a8abd3ea2..1de99f944 100644
--- a/modules/user/user.test
+++ b/modules/user/user.test
@@ -31,7 +31,8 @@ class UserRegistrationTestCase extends DrupalWebTestCase {
$this->assertText(t('Your password and further instructions have been sent to your e-mail address.'), t('User registered successfully.'));
// Check database for created user.
- $user = user_load($edit);
+ $users = user_load_multiple(array(), array('name' => $name, 'mail' => $mail));
+ $user = reset($users);
$this->assertTrue($user, t('User found in database.'));
$this->assertTrue($user->uid > 0, t('User has valid user id.'));
@@ -74,7 +75,7 @@ class UserRegistrationTestCase extends DrupalWebTestCase {
// Make sure password changes are present in database.
require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'includes/password.inc');
- $user = user_load(array('uid' => $user->uid));
+ $user = user_load($user->uid, TRUE);
$this->assertTrue(user_check_password($new_pass, $user), t('Correct password in database.'));
// Logout of user account.
@@ -170,7 +171,7 @@ class UserCancelTestCase extends DrupalWebTestCase {
$account = $this->drupalCreateUser(array());
$this->drupalLogin($account);
// Load real user object.
- $account = user_load($account->uid);
+ $account = user_load($account->uid, TRUE);
// Create a node.
$node = $this->drupalCreateNode(array('uid' => $account->uid));
@@ -183,7 +184,8 @@ class UserCancelTestCase extends DrupalWebTestCase {
$timestamp = $account->login;
$this->drupalGet("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
$this->assertResponse(403, t('Bogus cancelling request rejected.'));
- $this->assertTrue(user_load(array('uid' => $account->uid, 'status' => 1)), t('User account was not canceled.'));
+ $account = user_load($account->uid);
+ $this->assertTrue($account->status == 1, t('User account was not canceled.'));
// Confirm user's content has not been altered.
$test_node = node_load($node->nid, NULL, TRUE);
@@ -200,7 +202,7 @@ class UserCancelTestCase extends DrupalWebTestCase {
$account = $this->drupalCreateUser(array('cancel account'));
$this->drupalLogin($account);
// Load real user object.
- $account = user_load($account->uid);
+ $account = user_load($account->uid, TRUE);
// Create a node.
$node = $this->drupalCreateNode(array('uid' => $account->uid));
@@ -217,13 +219,14 @@ class UserCancelTestCase extends DrupalWebTestCase {
$bogus_timestamp = $timestamp + 60;
$this->drupalGet("user/$account->uid/cancel/confirm/$bogus_timestamp/" . user_pass_rehash($account->pass, $bogus_timestamp, $account->login));
$this->assertText(t('You have tried to use an account cancellation link that has expired. Please request a new one using the form below.'), t('Bogus cancelling request rejected.'));
- $this->assertTrue(user_load(array('uid' => $account->uid, 'status' => 1)), t('User account was not canceled.'));
+ $account = user_load($account->uid);
+ $this->assertTrue($account->status == 1, t('User account was not canceled.'));
// Attempt expired account cancellation request confirmation.
$bogus_timestamp = $timestamp - 86400 - 60;
$this->drupalGet("user/$account->uid/cancel/confirm/$bogus_timestamp/" . user_pass_rehash($account->pass, $bogus_timestamp, $account->login));
$this->assertText(t('You have tried to use an account cancellation link that has expired. Please request a new one using the form below.'), t('Expired cancel account request rejected.'));
- $this->assertTrue(user_load(array('uid' => $account->uid, 'status' => 1)), t('User account was not canceled.'));
+ $this->assertTrue(reset(user_load_multiple(array($account->uid), array('status' => 1))), t('User account was not canceled.'));
// Confirm user's content has not been altered.
$test_node = node_load($node->nid, NULL, TRUE);
@@ -237,10 +240,11 @@ class UserCancelTestCase extends DrupalWebTestCase {
variable_set('user_cancel_method', 'user_cancel_block');
// Create a user.
- $account = $this->drupalCreateUser(array('cancel account'));
- $this->drupalLogin($account);
+ $web_user = $this->drupalCreateUser(array('cancel account'));
+ $this->drupalLogin($web_user);
+
// Load real user object.
- $account = user_load($account->uid);
+ $account = user_load($web_user->uid, TRUE);
// Attempt to cancel account.
$this->drupalGet('user/' . $account->uid . '/edit');
@@ -251,12 +255,14 @@ class UserCancelTestCase extends DrupalWebTestCase {
// Confirm account cancellation.
$timestamp = time();
+
$this->drupalPost(NULL, NULL, t('Cancel account'));
$this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), t('Account cancellation request mailed message displayed.'));
// Confirm account cancellation request.
$this->drupalGet("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
- $this->assertTrue(user_load(array('uid' => $account->uid, 'status' => 0)), t('User has been blocked.'));
+ $account = user_load($account->uid, TRUE);
+ $this->assertTrue($account->status == 0, t('User has been blocked.'));
// Confirm user is logged out.
$this->assertNoText($account->name, t('Logged out.'));
@@ -272,7 +278,7 @@ class UserCancelTestCase extends DrupalWebTestCase {
$account = $this->drupalCreateUser(array('cancel account'));
$this->drupalLogin($account);
// Load real user object.
- $account = user_load($account->uid);
+ $account = user_load($account->uid, TRUE);
// Create a node with two revisions.
$node = $this->drupalCreateNode(array('uid' => $account->uid));
@@ -293,7 +299,8 @@ class UserCancelTestCase extends DrupalWebTestCase {
// Confirm account cancellation request.
$this->drupalGet("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
- $this->assertTrue(user_load(array('uid' => $account->uid, 'status' => 0)), t('User has been blocked.'));
+ $account = user_load($account->uid, TRUE);
+ $this->assertTrue($account->status == 0, t('User has been blocked.'));
// Confirm user's content has been unpublished.
$test_node = node_load($node->nid, NULL, TRUE);
@@ -315,7 +322,7 @@ class UserCancelTestCase extends DrupalWebTestCase {
$account = $this->drupalCreateUser(array('cancel account'));
$this->drupalLogin($account);
// Load real user object.
- $account = user_load($account->uid);
+ $account = user_load($account->uid, TRUE);
// Create a simple node.
$node = $this->drupalCreateNode(array('uid' => $account->uid));
@@ -342,7 +349,7 @@ class UserCancelTestCase extends DrupalWebTestCase {
// Confirm account cancellation request.
$this->drupalGet("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
- $this->assertFalse(user_load($account->uid), t('User is not found in the database.'));
+ $this->assertFalse(user_load($account->uid, TRUE), t('User is not found in the database.'));
// Confirm that user's content has been attributed to anonymous user.
$test_node = node_load($node->nid, NULL, TRUE);
@@ -366,7 +373,7 @@ class UserCancelTestCase extends DrupalWebTestCase {
$account = $this->drupalCreateUser(array('cancel account'));
$this->drupalLogin($account);
// Load real user object.
- $account = user_load($account->uid);
+ $account = user_load($account->uid, TRUE);
// Create a simple node.
$node = $this->drupalCreateNode(array('uid' => $account->uid));
@@ -398,7 +405,7 @@ class UserCancelTestCase extends DrupalWebTestCase {
// Confirm account cancellation request.
$this->drupalGet("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
- $this->assertFalse(user_load($account->uid), t('User is not found in the database.'));
+ $this->assertFalse(user_load($account->uid, TRUE), t('User is not found in the database.'));
// Confirm that user's content has been deleted.
$this->assertFalse(node_load($node->nid, NULL, TRUE), t('Node of the user has been deleted.'));
@@ -472,13 +479,14 @@ class UserCancelTestCase extends DrupalWebTestCase {
$status = TRUE;
foreach ($users as $account) {
$status = $status && (strpos($this->content, t('%name has been deleted.', array('%name' => $account->name))) !== FALSE);
- $status = $status && !user_load($account->uid);
+ $status = $status && !user_load($account->uid, TRUE);
}
$this->assertTrue($status, t('Users deleted and not found in the database.'));
// Ensure that admin account was not cancelled.
$this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), t('Account cancellation request mailed message displayed.'));
- $this->assertTrue(user_load(array('uid' => $admin_user->uid, 'status' => 1)), t('Administrative user is found in the database and enabled.'));
+ $admin_user = user_load($admin_user->uid);
+ $this->assertTrue($admin_user->status == 1, t('Administrative user is found in the database and enabled.'));
}
}
@@ -791,13 +799,13 @@ class UserAdminTestCase extends DrupalWebTestCase {
$this->assertText($user_c->name, t('Found user C on filtered by perm admin users page'));
// Test blocking of a user.
- $account = user_load(array('name' => $user_b->name));
+ $account = user_load($user_b->uid);
$this->assertEqual($account->status, 1, 'User B not blocked');
$edit = array();
$edit['operation'] = 'block';
$edit['accounts['. $account->uid .']'] = TRUE;
$this->drupalPost('admin/user/user', $edit, t('Update'));
- $account = user_load(array('name' => $user_b->name));
+ $account = user_load($user_b->uid, TRUE);
$this->assertEqual($account->status, 0, 'User B blocked');
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 06:15:21 +0000