summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKo- <k.stoffelen@cs.ru.nl>2017-03-11 17:04:21 +0100
committerKo- <k.stoffelen@cs.ru.nl>2017-03-11 17:04:21 +0100
commit0024b67aaf1b5fd79a2e73789a4c903364162e54 (patch)
treec01ec94b8d871b0905ed550391ac7be5e5b10e52 /core
parent801b600ec348edab2447866b349a0d163db94f15 (diff)
downloadnextcloud-server-0024b67aaf1b5fd79a2e73789a4c903364162e54.tar.gz
nextcloud-server-0024b67aaf1b5fd79a2e73789a4c903364162e54.zip
Check that set_time_limit is not disabled before calling it
Signed-off-by: Ko- <k.stoffelen@cs.ru.nl>
Diffstat (limited to 'core')
-rw-r--r--core/ajax/update.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/ajax/update.php b/core/ajax/update.php
index fca40477d60..37abdc5dc3b 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -29,7 +29,10 @@
*/
use Symfony\Component\EventDispatcher\GenericEvent;
-set_time_limit(0);
+if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+ @set_time_limit(0);
+}
+
require_once '../../lib/base.php';
$l = \OC::$server->getL10N('core');