From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 23 Apr 2019 08:31:43 +0000 (+0200)
Subject: Resolved two issues
X-Git-Tag: 5.2.0_Alpha_1~122^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3063b539a78a44d1452b8252a12440a889218bf4;p=GitHub%2FWoltLab%2FWCF.git

Resolved two issues
---

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Package/PrepareInstallation.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Package/PrepareInstallation.js
index 824ffa8259..23ea532bda 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Package/PrepareInstallation.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Package/PrepareInstallation.js
@@ -73,7 +73,9 @@ define(['Ajax', 'Core', 'Language', 'Ui/Dialog'], function(Ajax, Core, Language,
 		
 		_ajaxSuccess: function(data) {
 			if (data.returnValues.queueID) {
-				UiDialog.close(this);
+				if (UiDialog.isOpen(this)) {
+					UiDialog.close(this);
+				}
 				
 				var installation = new window.WCF.ACP.Package.Installation(data.returnValues.queueID, undefined, false);
 				installation.prepareInstallation();
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 7af9a557bc..931322ef4a 100644
--- a/wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php
+++ b/wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php
@@ -67,7 +67,10 @@ class PackageUpdateAction extends AbstractDatabaseObjectAction {
 		
 		// there are no available package update servers
 		if (empty($availableUpdateServers)) {
-			WCF::getTPL()->assign(['packageUpdates' => []]);
+			WCF::getTPL()->assign([
+				'thirdPartySources' => [],
+				'trustedSources' => [],
+			]);
 			
 			return ['count' => 0, 'pageCount' => 0, 'searchID' => 0, 'template' => WCF::getTPL()->fetch('packageSearchResultList')];
 		}
@@ -94,7 +97,10 @@ class PackageUpdateAction extends AbstractDatabaseObjectAction {
 		
 		// no matches found
 		if (empty($packageUpdateIDs)) {
-			WCF::getTPL()->assign(['packageUpdates' => []]);
+			WCF::getTPL()->assign([
+				'thirdPartySources' => [],
+				'trustedSources' => [],
+			]);
 			
 			return ['count' => 0, 'pageCount' => 0, 'searchID' => 0, 'template' => WCF::getTPL()->fetch('packageSearchResultList')];
 		}
@@ -129,7 +135,10 @@ class PackageUpdateAction extends AbstractDatabaseObjectAction {
 		
 		// no matches found
 		if (empty($packageUpdates)) {
-			WCF::getTPL()->assign(['packageUpdates' => []]);
+			WCF::getTPL()->assign([
+				'thirdPartySources' => [],
+				'trustedSources' => [],
+			]);
 			
 			return ['count' => 0, 'pageCount' => 0, 'searchID' => 0, 'template' => WCF::getTPL()->fetch('packageSearchResultList')];
 		}