From 6a156a34566d6a717b4b4d6dd0f30499e8703ea5 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 4 Jun 2013 01:04:41 +0200
Subject: [PATCH] Fixed automatic package update

---
 wcfsetup/install/files/acp/templates/packageUpdate.tpl        | 4 ++--
 .../lib/data/package/update/PackageUpdateAction.class.php     | 2 +-
 wcfsetup/install/lang/de.xml                                  | 2 ++
 wcfsetup/install/lang/en.xml                                  | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/packageUpdate.tpl b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
index 01374232b7..82015303d9 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdate.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
@@ -1,4 +1,4 @@
-{include file='header' pageTitle='wcf.acp.packageUpdate'}
+{include file='header' pageTitle='wcf.acp.package.update.title'}
 
 <script type="text/javascript">
 	//<![CDATA[
@@ -13,7 +13,7 @@
 </script>
 
 <header class="boxHeadline">
-	<h1>{lang}wcf.acp.packageUpdate{/lang}</h1>
+	<h1>{lang}wcf.acp.package.update.title{/lang}</h1>
 </header>
 
 <div class="container containerPadding marginTop">
diff --git a/wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php b/wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php
index f434172f2d..ba0dfe65a4 100644
--- a/wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php
+++ b/wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php
@@ -382,7 +382,7 @@ class PackageUpdateAction extends AbstractDatabaseObjectAction {
 			PackageUpdateServer::storeAuthData($this->parameters['authData']['packageUpdateServerID'], $this->parameters['authData']['username'], $this->parameters['authData']['password'], $this->parameters['authData']['saveCredentials']);
 		}
 		
-		$scheduler = new PackageInstallationScheduler($this->parameters['package']);
+		$scheduler = new PackageInstallationScheduler($this->parameters['packages']);
 		
 		try {
 			$scheduler->buildPackageInstallationStack();
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index f3249ae929..ceac12b7da 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -782,6 +782,7 @@
 		<item name="wcf.acp.package.application.installed"><![CDATA[Installierte Anwendungen]]></item>
 		<item name="wcf.acp.package.application.title"><![CDATA[Anwendungen]]></item>
 		<item name="wcf.acp.package.author"><![CDATA[Entwickler]]></item>
+		<item name="wcf.acp.package.availableVersions"><![CDATA[Verfügbare Versionen]]></item>
 		<item name="wcf.acp.package.button.info"><![CDATA[Informationen]]></item>
 		<item name="wcf.acp.package.button.installPackage"><![CDATA[Paket installieren]]></item>
 		<item name="wcf.acp.package.button.uninstall"><![CDATA[Deinstallieren]]></item>
@@ -813,6 +814,7 @@
 		<item name="wcf.acp.package.installation.step.install.success"><![CDATA[Installation abgeschlossen]]></item>
 		<item name="wcf.acp.package.installation.step.update"><![CDATA[„{$packageName}“ wird aktualisiert …]]></item>
 		<item name="wcf.acp.package.installation.step.update.success"><![CDATA[Aktualisierung abgeschlossen]]></item>
+		<item name="wcf.acp.package.installedVersion"><![CDATA[Installierte Version]]></item>
 		<item name="wcf.acp.package.install.step.prepare"><![CDATA[Installation wird vorbereitet …]]></item>
 		<item name="wcf.acp.package.install.title"><![CDATA[Paket-Installation]]></item>
 		<item name="wcf.acp.package.installation.requiredVersion"><![CDATA[Benötigte Version]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 14ba9b48a2..4fcc0f082d 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -781,6 +781,7 @@ Examples for medium ID detection:
 		<item name="wcf.acp.package.application.installed"><![CDATA[Installed Applications]]></item>
 		<item name="wcf.acp.package.application.title"><![CDATA[Applications]]></item>
 		<item name="wcf.acp.package.author"><![CDATA[Developer]]></item>
+		<item name="wcf.acp.package.availableVersions"><![CDATA[Available Versions]]></item>
 		<item name="wcf.acp.package.button.info"><![CDATA[Details]]></item>
 		<item name="wcf.acp.package.button.installPackage"><![CDATA[Install Package]]></item>
 		<item name="wcf.acp.package.button.uninstall"><![CDATA[Uninstall]]></item>
@@ -812,6 +813,7 @@ Examples for medium ID detection:
 		<item name="wcf.acp.package.installation.step.install.success"><![CDATA[Installation completed]]></item>
 		<item name="wcf.acp.package.installation.step.update"><![CDATA[Updating “{$packageName}” …]]></item>
 		<item name="wcf.acp.package.installation.step.update.success"><![CDATA[Updated completed]]></item>
+		<item name="wcf.acp.package.installedVersion"><![CDATA[Installed Version]]></item>
 		<item name="wcf.acp.package.install.step.prepare"><![CDATA[Preparing Installation …]]></item>
 		<item name="wcf.acp.package.install.title"><![CDATA[Installation]]></item>
 		<item name="wcf.acp.package.installation.requiredVersion"><![CDATA[Required Version]]></item>
-- 
2.20.1