From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Thu, 10 Dec 2020 13:21:03 +0000 (+0100)
Subject: Remove obsolete PACKAGE_ID check in ImportCLICommand
X-Git-Tag: 5.3.2~47
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c8f3f503fb2c903492517a2f6b5b3775b4d9aa42;p=GitHub%2FWoltLab%2FWCF.git

Remove obsolete PACKAGE_ID check in ImportCLICommand
---

diff --git a/wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php b/wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php
index 6eea807cc0..39544679fe 100644
--- a/wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php
+++ b/wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php
@@ -123,17 +123,6 @@ class ImportCLICommand implements ICLICommand {
 			return;
 		}
 		
-		if (PACKAGE_ID == 1) {
-			CLIWCF::getReader()->println(StringUtil::stripHTML(WCF::getLanguage()->get('wcf.acp.dataImport.cli.info.wcf')));
-			
-			$answer = CLIWCF::getReader()->readLine('> ');
-			if ($answer === null) exit;
-			if (mb_strtolower($answer) != 'y') {
-				CLIWCF::getReader()->setHistoryEnabled(true);
-				return;
-			}
-		}
-		
 		// step 1) previous import
 		$sql = "SELECT	COUNT(*)
 			FROM	wcf".WCF_N."_import_mapping";
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index c3d365f917..d88a875a71 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -347,7 +347,6 @@
 		<item name="wcf.acp.dataImport.cli.configure.data.error.noSelection"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du hast{else}Sie haben{/if} keine Daten zum Import ausgewählt. Der Import wird beendet.]]></item>
 		<item name="wcf.acp.dataImport.cli.configure.data.error.invalid"><![CDATA[Der ausgewählte Datentyp ist ungültig.]]></item>
 		<item name="wcf.acp.dataImport.cli.configure.data.selectAll"><![CDATA[Alle Daten]]></item>
-		<item name="wcf.acp.dataImport.cli.info.wcf"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du hast{else}Sie haben{/if} keine App beim Skript-Aufruf mittels --packageID={PACKAGE_ID} geladen. Wenn {if LANGUAGE_USE_INFORMAL_VARIANT}du{else}Sie{/if} Daten für eine App importieren {if LANGUAGE_USE_INFORMAL_VARIANT}möchtest{else}möchten{/if}, {if LANGUAGE_USE_INFORMAL_VARIANT}musst du{else}müssen Sie{/if} das Skript mit der ID des entsprechenden Pakets starten. {if LANGUAGE_USE_INFORMAL_VARIANT}Möchtest du{else}Möchten Sie{/if} mit dem Import fortfahren? [YN]]]></item>
 		<item name="wcf.acp.dataImport.cli.selection"><![CDATA[Auswahl? [{if $minSelection == $maxSelection}{$minSelection}{else}{$minSelection}-{$maxSelection}{/if}]]]></item>
 		<item name="wcf.acp.dataImport.completed"><![CDATA[Import abgeschlossen.]]></item>
 		<item name="wcf.acp.dataImport.configure.data"><![CDATA[Daten]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index b8d3d634ab..c4b3b583f9 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -324,7 +324,6 @@
 		<item name="wcf.acp.dataImport.cli.configure.data.error.noSelection"><![CDATA[You did not specify any data for importing, the import has been aborted.]]></item>
 		<item name="wcf.acp.dataImport.cli.configure.data.error.invalid"><![CDATA[The selected data type is invalid.]]></item>
 		<item name="wcf.acp.dataImport.cli.configure.data.selectAll"><![CDATA[All data]]></item>
-		<item name="wcf.acp.dataImport.cli.info.wcf"><![CDATA[You did not load any application through --packageID={PACKAGE_ID}. If you wish to import application-specific data, you must call this script along with the desired package ID. Do you wish to continue the import? [YN]]]></item>
 		<item name="wcf.acp.dataImport.cli.selection"><![CDATA[Selection? [{if $minSelection == $maxSelection}{$minSelection}{else}{$minSelection}-{$maxSelection}{/if}]]]></item>
 		<item name="wcf.acp.dataImport.completed"><![CDATA[Import completed.]]></item>
 		<item name="wcf.acp.dataImport.configure.data"><![CDATA[Data]]></item>