summaryrefslogtreecommitdiff
path: root/modules/node/node.module
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-07-28 19:18:08 +0000
committerDries Buytaert <dries@buytaert.net>2009-07-28 19:18:08 +0000
commita938e18a1bd36d887010863817470b690fdbf6f3 (patch)
treeadbc7edb165255a47739fdbe7e0184c241f6340c /modules/node/node.module
parentff8b0618f5892d165720453efcd318b0d85a6f8c (diff)
downloadbrdo-a938e18a1bd36d887010863817470b690fdbf6f3.tar.gz
brdo-a938e18a1bd36d887010863817470b690fdbf6f3.tar.bz2
- Patch #491556 by Berdir: completed converting core to DBTNG. Oh my. Kudos to Berdir for this humongous effort.
Diffstat (limited to 'modules/node/node.module')
-rw-r--r--modules/node/node.module4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/node/node.module b/modules/node/node.module
index a81815682..5e13be9e0 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -2699,7 +2699,7 @@ function _node_access_rebuild_batch_operation(&$context) {
// Process the next 20 nodes.
$limit = 20;
- $nids = db_query_range("SELECT nid FROM {node} WHERE nid > %d ORDER BY nid ASC", $context['sandbox']['current_node'], 0, $limit)->fetchCol();
+ $nids = db_query_range("SELECT nid FROM {node} WHERE nid > :nid ORDER BY nid ASC", array(':nid' => $context['sandbox']['current_node']), 0, $limit)->fetchCol();
$nodes = node_load_multiple($nids, array(), TRUE);
foreach ($nodes as $node) {
// To preserve database integrity, only acquire grants if the node
@@ -3148,7 +3148,7 @@ function node_requirements($phase) {
// Only show rebuild button if there are either 0, or 2 or more, rows
// in the {node_access} table, or if there are modules that
// implement hook_node_grants().
- $grant_count = db_result(db_query('SELECT COUNT(*) FROM {node_access}'));
+ $grant_count = db_query('SELECT COUNT(*) FROM {node_access}')->fetchField();
if ($grant_count != 1 || count(module_implements('node_grants')) > 0) {
$value = format_plural($grant_count, 'One permission in use', '@count permissions in use', array('@count' => $grant_count));
} else {