From e3690d92468907b231acd0e06dde7ba0612cf777 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 31 May 2010 08:02:33 +0000
Subject: - Patch #478946 by Scott Reynolds: node_access() batch rebuild will
 'fail' when a node isn't loadable.

---
 modules/node/node.module | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/node/node.module')

diff --git a/modules/node/node.module b/modules/node/node.module
index 12f1017ba..a5d9d770c 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -3260,14 +3260,14 @@ function _node_access_rebuild_batch_operation(&$context) {
   $limit = 20;
   $nids = db_query_range("SELECT nid FROM {node} WHERE nid > :nid ORDER BY nid ASC", 0, $limit, array(':nid' => $context['sandbox']['current_node']))->fetchCol();
   $nodes = node_load_multiple($nids, array(), TRUE);
-  foreach ($nodes as $node) {
+  foreach ($nodes as $nid => $node) {
     // To preserve database integrity, only acquire grants if the node
     // loads successfully.
     if (!empty($node)) {
       node_access_acquire_grants($node);
     }
     $context['sandbox']['progress']++;
-    $context['sandbox']['current_node'] = $node->nid;
+    $context['sandbox']['current_node'] = $nid;
   }
 
   // Multistep processing : report progress.
-- 
cgit v1.2.3