summaryrefslogtreecommitdiffstats
path: root/lib/base.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/base.php')
-rw-r--r--lib/base.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php
index 68178b06c5b..04b6d82b1df 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -616,7 +616,9 @@ class OC {
//Let´s try to overwrite some defaults anyway
//try to set the maximum execution time to 60min
- @set_time_limit(3600);
+ if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+ @set_time_limit(3600);
+ }
@ini_set('max_execution_time', 3600);
@ini_set('max_input_time', 3600);