From 0b63b42ac96dd62cd7df743c7af150e9c6384d42 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Thu, 29 Oct 2020 10:18:26 +0100 Subject: [PATCH] Skip system requirements during setup if they are met (#3662) Close #3559 --- .../files/lib/system/WCFSetup.class.php | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php index d8868b779e..85f6f259fc 100644 --- a/wcfsetup/install/files/lib/system/WCFSetup.class.php +++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php @@ -398,11 +398,21 @@ class WCFSetup extends WCF { $system['cookie']['result'] = !empty($_COOKIE['wcfsetup_cookietest']) && $_COOKIE['wcfsetup_cookietest'] == TMP_FILE_PREFIX; - WCF::getTPL()->assign([ - 'system' => $system, - 'nextStep' => 'configureDirectories' - ]); - WCF::getTPL()->display('stepShowSystemRequirements'); + foreach ($system as $result) { + if (!$result['result']) { + WCF::getTPL()->assign([ + 'system' => $system, + 'nextStep' => 'configureDirectories' + ]); + + WCF::getTPL()->display('stepShowSystemRequirements'); + + return; + } + } + + // If all system requirements are met, directly go to next step. + $this->gotoNextStep('configureDirectories'); } /** -- 2.20.1