From d3dba5529aab6fd822b0a1558a8b71eaa18a0388 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Thu, 28 Jul 2016 10:50:07 +0200 Subject: [PATCH] Fixed missing language variables in last step of wcfsetup --- .../files/lib/system/WCFSetup.class.php | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php index 6871c272c1..e62d098cc0 100644 --- a/wcfsetup/install/files/lib/system/WCFSetup.class.php +++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php @@ -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.'/'; -- 2.20.1