1 files changed, 3 insertions, 1 deletions
diff --git a/cron.php b/cron.php
index feb680bd9c2..f6c52446d3c 100644
--- a/cron.php
+++ b/cron.php
@@ -84,7 +84,9 @@ try {
 
 	if (OC::$CLI) {
 		// set to run indefinitely if needed
-		set_time_limit(0);
+		if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+			@set_time_limit(0);
+		}
 
 		// the cron job must be executed with the right user
 		if (!function_exists('posix_getuid')) {