Fix the WCFSetup

Author: dtdesign

wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php

@@ -16,10 +16,13 @@
 return static function (): void {
     $eventHandler = EventHandler::getInstance();
 
-    WCF::getTPL()->assign(
-        'executeCronjobs',
-        CronjobScheduler::getInstance()->getNextExec() < TIME_NOW && \defined('OFFLINE') && !OFFLINE
-    );
+    $cronjobNextExec = CronjobScheduler::getInstance()->getNextExec();
+    if ($cronjobNextExec !== null) {
+        WCF::getTPL()->assign(
+            'executeCronjobs',
+            $cronjobNextExec < TIME_NOW && \defined('OFFLINE') && !OFFLINE
+        );
+    }
 
     $eventHandler->register(
         \wcf\event\user\authentication\UserLoggedIn::class,
@@ -259,7 +262,8 @@ static function (\wcf\event\endpoint\ControllerCollecting $event) {
         }
     );
 
-    if (MODULE_CONTACT_FORM) {
+    // The options are not available while the WCFSetup process has not yet completed.
+    if (defined('MODULE_CONTACT_FORM') && MODULE_CONTACT_FORM) {
         $eventHandler->register(ItemCollecting::class, static function (ItemCollecting $event) {
             if (!WCF::getSession()->getPermission("admin.contact.canManageContactForm")) {
                 return;

wcfsetup/install/files/lib/system/WCFSetup.class.php

@@ -769,16 +769,22 @@ protected function installLanguage(): ResponseInterface
             LanguageEditor::importFromXML($xml, 1);
         }
 
-        // set default language
-        $language = LanguageFactory::getInstance()->getLanguageByCode(
-            \in_array(
-                self::$selectedLanguageCode,
-                $languageCodes
-            ) ? self::$selectedLanguageCode : $languageCodes[0]
-        );
-        LanguageFactory::getInstance()->makeDefault($language->languageID);
+        $defaultLanguageCode = \in_array(
+            self::$selectedLanguageCode,
+            $languageCodes
+        ) ? self::$selectedLanguageCode : $languageCodes[0];
+
+        $sql = "UPDATE  wcf1_language
+                SET     isDefault = ?
+                WHERE   languageCode = ?";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute([
+            1,
+            $defaultLanguageCode,
+        ]);
+
+        \assert($statement->getAffectedRows() === 1);
 
-        // rebuild language cache
         (new LanguageCache())->rebuild();
 
         return $this->gotoNextStep('createUser');

wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php

@@ -107,7 +107,7 @@ public function executeCronjobs(): void
     /**
      * Returns the next execution time.
      */
-    public function getNextExec(): int
+    public function getNextExec(): ?int
     {
         return $this->cache['nextExec'];
     }

wcfsetup/install/files/lib/system/language/LanguageFactory.class.php

@@ -72,16 +72,6 @@ public function getUserLanguage(?int $languageID = null): Language
      */
     public function getLanguageByCode(string $languageCode): ?Language
     {
-        if ($this->cache->codes === []) {
-            // called within WCFSetup
-            $sql = "SELECT  *
-                    FROM    wcf1_language
-                    WHERE   languageCode = ?";
-            $statement = WCF::getDB()->prepare($sql);
-            $statement->execute([$languageCode]);
-            return $statement->fetchObject(Language::class);
-        }
-
         return $this->cache->getLanguageByCode($languageCode);
     }