Fixes installation dialog title during setup

Fixes #1304

diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js
index 5fa20cdd9d275350baf79f1d06cbc45d6b43273e..a81e1f3de6efd9a3eadf922f8a9f3a14ca149d69 100644 (file)
--- a/wcfsetup/install/files/acp/js/WCF.ACP.js
+++ b/wcfsetup/install/files/acp/js/WCF.ACP.js
@@ -382,12 +382,16 @@ WCF.ACP.Package.Installation = Class.extend({
         */
        init: function(queueID, actionName, allowRollback) {
                this._actionName = (actionName) ? actionName : 'InstallPackage';
+               if (this._actionName === 'Setup') {
+                       // 'Setup' is an alias for 'InstallPackage' used during WCFSetup
+                       this._actionName = 'InstallPackage';
+               }
                this._allowRollback = (allowRollback === true) ? true : false;
                this._queueID = queueID;
                
                switch (this._actionName) {
                        case 'InstallPackage':
-                               if (allowRollback) {
+                               if (allowRollback || actionName === 'Setup') {
                                        this._dialogTitle = 'wcf.acp.package.installation.title';
                                }
                                else {

diff --git a/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl b/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl
index 6fd157edd270d9c5dea4461193a44bb0fe60679a..1ea097a4b1daacb28dc296e506224bd6a8316213 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl
@@ -5,7 +5,7 @@
        $(function() {
                WCF.Language.add('wcf.acp.package.installation.title', '{lang}wcf.acp.package.installation.title{/lang}');
 
-               var $installation = new WCF.ACP.Package.Installation({@$queueID});
+               var $installation = new WCF.ACP.Package.Installation({@$queueID}, 'Setup');
                $installation.prepareInstallation();
        });
        //]]>