From 691693304b0ccafda3c2002452a8b8b8afe729f3 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Wed, 5 Aug 2009 15:58:35 +0000
Subject: #193383 by TheRec, JirkaRybka, and Bart Jansens: Centralize calls to
 set_time_limit() and prevent warnings/errors.

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

(limited to 'modules/node')

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);
-- 
cgit v1.2.3