From 0024b67aaf1b5fd79a2e73789a4c903364162e54 Mon Sep 17 00:00:00 2001 From: Ko- Date: Sat, 11 Mar 2017 17:04:21 +0100 Subject: Check that set_time_limit is not disabled before calling it Signed-off-by: Ko- --- settings/Controller/EncryptionController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'settings/Controller/EncryptionController.php') diff --git a/settings/Controller/EncryptionController.php b/settings/Controller/EncryptionController.php index cda50853fdc..0c8dd529a7d 100644 --- a/settings/Controller/EncryptionController.php +++ b/settings/Controller/EncryptionController.php @@ -105,7 +105,9 @@ class EncryptionController extends Controller { */ public function startMigration() { // allow as long execution on the web server as possible - set_time_limit(0); + if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) { + @set_time_limit(0); + } try { -- cgit v1.2.3