Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.756.2.3
diff -u -p -r1.756.2.3 common.inc
--- includes/common.inc	11 Feb 2008 13:11:14 -0000	1.756.2.3
+++ includes/common.inc	12 Feb 2008 09:43:01 -0000
@@ -2506,8 +2506,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);
   }
 
Index: includes/locale.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/locale.inc,v
retrieving revision 1.174
diff -u -p -r1.174 locale.inc
--- includes/locale.inc	9 Jan 2008 21:36:13 -0000	1.174
+++ includes/locale.inc	12 Feb 2008 09:43:01 -0000
@@ -963,8 +963,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);
   }
 
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.947
diff -u -p -r1.947 node.module
--- modules/node/node.module	3 Feb 2008 19:41:47 -0000	1.947
+++ modules/node/node.module	12 Feb 2008 09:43:01 -0000
@@ -2288,8 +2288,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}");