#347250 by catch, drewish, and Berdir: Add function for loading multiple users in one request.

2 files changed, 4 insertions, 4 deletions

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;
     }