diff -urp --strip-trailing-cr ../drupal-6.x-dev/includes/common.inc ./includes/common.inc
--- ../drupal-6.x-dev/includes/common.inc	2007-11-26 23:34:08.000000000 +0100
+++ ./includes/common.inc	2007-11-29 20:28:49.000000000 +0100
@@ -2560,8 +2560,8 @@ function page_set_cache() {
  * Returns TRUE if ran successfully
  */
 function drupal_cron_run() {
-  // If not in 'safe mode', increase the maximum execution time:
-  if (!ini_get('safe_mode')) {
+  // If allowed, increase the maximum execution time.
+  if (!ini_get('safe_mode') && strpos(ini_get('disable_functions'), 'set_time_limit') === FALSE) {
     set_time_limit(240);
   }
 
diff -urp --strip-trailing-cr ../drupal-6.x-dev/includes/locale.inc ./includes/locale.inc
--- ../drupal-6.x-dev/includes/locale.inc	2007-11-27 00:33:03.000000000 +0100
+++ ./includes/locale.inc	2007-11-29 20:28:49.000000000 +0100
@@ -955,8 +955,8 @@ function locale_add_language($langcode, 
  *   Text group to import PO file into (eg. 'default' for interface translations)
  */
 function _locale_import_po($file, $langcode, $mode, $group = NULL) {
-  // If not in 'safe mode', increase the maximum execution time.
-  if (!ini_get('safe_mode')) {
+  // If allowed, increase the maximum execution time.
+  if (!ini_get('safe_mode') && strpos(ini_get('disable_functions'), 'set_time_limit') === FALSE) {
     set_time_limit(240);
   }
 
diff -urp --strip-trailing-cr ../drupal-6.x-dev/modules/node/node.module ./modules/node/node.module
--- ../drupal-6.x-dev/modules/node/node.module	2007-11-29 12:29:24.000000000 +0100
+++ ./modules/node/node.module	2007-11-29 20:28:49.000000000 +0100
@@ -2145,8 +2145,8 @@ function node_access_rebuild($batch_mode
       batch_set($batch);
     }
     else {
-      // If not in 'safe mode', increase the maximum execution time.
-      if (!ini_get('safe_mode')) {
+      // If allowed, increase the maximum execution time.
+      if (!ini_get('safe_mode') && strpos(ini_get('disable_functions'), 'set_time_limit') === FALSE) {
         set_time_limit(240);
       }
       $result = db_query("SELECT nid FROM {node}");