diff options
| author | Ko- <k.stoffelen@cs.ru.nl> | 2017-03-11 17:04:21 +0100 |
|---|---|---|
| committer | Ko- <k.stoffelen@cs.ru.nl> | 2017-03-11 17:04:21 +0100 |
| commit | 0024b67aaf1b5fd79a2e73789a4c903364162e54 (patch) | |
| tree | c01ec94b8d871b0905ed550391ac7be5e5b10e52 /settings/Controller/EncryptionController.php | |
| parent | 801b600ec348edab2447866b349a0d163db94f15 (diff) | |
| download | nextcloud-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 'settings/Controller/EncryptionController.php')
| -rw-r--r-- | settings/Controller/EncryptionController.php | 4 |
1 files changed, 3 insertions, 1 deletions
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 { |