summaryrefslogtreecommitdiff
path: root/modules/node
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2009-08-05 15:58:35 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2009-08-05 15:58:35 +0000
commit691693304b0ccafda3c2002452a8b8b8afe729f3 (patch)
tree05ec348e8292f40bdf34e3aa259b3bfe2fd0f580 /modules/node
parentc3081764c3eabeed2318b7302339d52a21eb92f0 (diff)
downloadbrdo-691693304b0ccafda3c2002452a8b8b8afe729f3.tar.gz
brdo-691693304b0ccafda3c2002452a8b8b8afe729f3.tar.bz2
#193383 by TheRec, JirkaRybka, and Bart Jansens: Centralize calls to set_time_limit() and prevent warnings/errors.
Diffstat (limited to 'modules/node')
-rw-r--r--modules/node/node.module7
1 files changed, 3 insertions, 4 deletions
diff --git a/modules/node/node.module b/modules/node/node.module
index 5d8f3b5a7..5534d0b3c 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -2652,10 +2652,9 @@ function node_access_rebuild($batch_mode = FALSE) {
batch_set($batch);
}
else {
- // If not in 'safe mode', increase the maximum execution time.
- if (!ini_get('safe_mode')) {
- set_time_limit(240);
- }
+ // Try to allocate enough time to rebuild node grants
+ drupal_set_time_limit(240);
+
$nids = db_query("SELECT nid FROM {node}")->fetchCol();
foreach ($nids as $nid) {
$node = node_load($nid, NULL, TRUE);