Fixed missing language variables in last step of wcfsetup
authorMarcel Werk <burntime@woltlab.com>
Thu, 28 Jul 2016 08:50:07 +0000 (10:50 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 28 Jul 2016 08:50:07 +0000 (10:50 +0200)
wcfsetup/install/files/lib/system/WCFSetup.class.php

index 6871c272c16aac983d1165095293e6ab53777468..e62d098cc048cf5549a5af7af0f88d51327319cc 100644 (file)
@@ -21,6 +21,7 @@ use wcf\system\setup\Installer;
 use wcf\system\template\SetupTemplateEngine;
 use wcf\util\DirectoryUtil;
 use wcf\util\FileUtil;
+use wcf\util\HeaderUtil;
 use wcf\util\StringUtil;
 use wcf\util\UserUtil;
 use wcf\util\XML;
@@ -1082,6 +1083,18 @@ class WCFSetup extends WCF {
                }
                $tar->close();
                
+               // delete install files
+               $installPhpDeleted = @unlink('./install.php');
+               @unlink('./test.php');
+               $wcfSetupTarDeleted = @unlink('./WCFSetup.tar.gz');
+               
+               // render page
+               WCF::getTPL()->assign([
+                       'installPhpDeleted' => $installPhpDeleted,
+                       'wcfSetupTarDeleted' => $wcfSetupTarDeleted
+               ]);
+               $output = WCF::getTPL()->fetch('stepInstallPackages');
+               
                // register packages in queue
                // get new process id
                $sql = "SELECT  MAX(processNo) AS processNo
@@ -1184,16 +1197,9 @@ class WCFSetup extends WCF {
                SessionHandler::getInstance()->register('__wcfSetup_directories', self::$directories);
                SessionHandler::getInstance()->update();
                
-               $installPhpDeleted = @unlink('./install.php');
-               @unlink('./test.php');
-               $wcfSetupTarDeleted = @unlink('./WCFSetup.tar.gz');
-               
                // print page
-               WCF::getTPL()->assign([
-                       'installPhpDeleted' => $installPhpDeleted,
-                       'wcfSetupTarDeleted' => $wcfSetupTarDeleted
-               ]);
-               WCF::getTPL()->display('stepInstallPackages');
+               HeaderUtil::sendHeaders();
+               echo $output;
                
                // delete tmp files
                $directory = TMP_DIR.'/';