From 0531786379ccccceb39a13d187e13a3fdecf77db Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 25 May 2013 18:15:06 +0200
Subject: [PATCH] Fixes installation dialog title during setup

Fixes #1304
---
 wcfsetup/install/files/acp/js/WCF.ACP.js                    | 6 +++++-
 .../files/acp/templates/packageInstallationSetup.tpl        | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js
index 5fa20cdd9d..a81e1f3de6 100644
--- 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 6fd157edd2..1ea097a4b1 100644
--- 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();
 	});
 	//]]>
-- 
2.20.1