From 6d564f8a2436e027fc664ec3a5af9cd854526202 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 17 Apr 2021 17:23:09 +0200
Subject: [PATCH] Use new `lineBreakSeparatedText` option type

See WoltLab/WCF#4126
See WoltLab/WCF#4128
---
 ...ab.wcf.conversation_5.4_deleteLanguageItems.php | 14 ++++++++++++++
 language/de.xml                                    |  1 -
 language/en.xml                                    |  1 -
 package.xml                                        |  6 ++++--
 userGroupOption.xml                                |  2 +-
 5 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 files/acp/update_com.woltlab.wcf.conversation_5.4_deleteLanguageItems.php

diff --git a/files/acp/update_com.woltlab.wcf.conversation_5.4_deleteLanguageItems.php b/files/acp/update_com.woltlab.wcf.conversation_5.4_deleteLanguageItems.php
new file mode 100644
index 0000000..42a26b6
--- /dev/null
+++ b/files/acp/update_com.woltlab.wcf.conversation_5.4_deleteLanguageItems.php
@@ -0,0 +1,14 @@
+<?php
+
+use wcf\data\language\item\LanguageItemAction;
+use wcf\data\language\item\LanguageItemList;
+
+$languageItems = [
+    'wcf.acp.group.option.user.conversation.allowedAttachmentExtensions.description',
+];
+
+$languageItemList = new LanguageItemList();
+$languageItemList->getConditionBuilder()->add('languageItem IN (?)', [$languageItems]);
+$languageItemList->readObjects();
+
+(new LanguageItemAction($languageItemList->getObjects(), 'delete'))->executeAction();
diff --git a/language/de.xml b/language/de.xml
index 13478cf..5b1f2ea 100644
--- a/language/de.xml
+++ b/language/de.xml
@@ -25,7 +25,6 @@
 		<item name="wcf.acp.group.option.user.conversation.canUploadAttachment"><![CDATA[Kann Dateien anhängen]]></item>
 		<item name="wcf.acp.group.option.user.conversation.maxAttachmentSize"><![CDATA[Maximale Dateianhangsgröße]]></item>
 		<item name="wcf.acp.group.option.user.conversation.allowedAttachmentExtensions"><![CDATA[Erlaubte Dateiendungen]]></item>
-		<item name="wcf.acp.group.option.user.conversation.allowedAttachmentExtensions.description"><![CDATA[Eine Dateiendung pro Zeile]]></item>
 		<item name="wcf.acp.group.option.user.conversation.maxAttachmentCount"><![CDATA[Maximale Dateianhänge pro Nachricht]]></item>
 		<item name="wcf.acp.group.option.user.conversation.maxAttachmentCount.description"/>
 		<item name="wcf.acp.group.option.user.conversation.canEditMessage"><![CDATA[Kann eigene Nachrichten bearbeiten]]></item>
diff --git a/language/en.xml b/language/en.xml
index 1ea36bc..3d0fd02 100644
--- a/language/en.xml
+++ b/language/en.xml
@@ -25,7 +25,6 @@
 		<item name="wcf.acp.group.option.user.conversation.canUploadAttachment"><![CDATA[Can upload attachments]]></item>
 		<item name="wcf.acp.group.option.user.conversation.maxAttachmentSize"><![CDATA[Maximum Attachment File Size]]></item>
 		<item name="wcf.acp.group.option.user.conversation.allowedAttachmentExtensions"><![CDATA[Allowed Attachment File Extensions]]></item>
-		<item name="wcf.acp.group.option.user.conversation.allowedAttachmentExtensions.description"><![CDATA[Enter one extension per line.]]></item>
 		<item name="wcf.acp.group.option.user.conversation.maxAttachmentCount"><![CDATA[Maximum Attachments per Message]]></item>
 		<item name="wcf.acp.group.option.user.conversation.maxAttachmentCount.description"><![CDATA[The maximum number of attachments allowed per message.]]></item>
 		<item name="wcf.acp.group.option.user.conversation.canEditMessage"><![CDATA[Can edit their messages]]></item>
diff --git a/package.xml b/package.xml
index f03baad..153f636 100644
--- a/package.xml
+++ b/package.xml
@@ -40,12 +40,14 @@
 		<instruction type="script">acp/install_com.woltlab.wcf.conversation.php</instruction>
 		<instruction type="page" />
 	</instructions>
-
+	
 	<instructions type="update" fromversion="5.3.*">
 		<instruction type="file" />
 		<instruction type="template" />
-
+		
 		<instruction type="objectType" />
 		<instruction type="userGroupOption" />
+		
+		<instruction type="script">acp/update_com.woltlab.wcf.conversation_5.4_deleteLanguageItems.php</instruction>
 	</instructions>
 </package>
diff --git a/userGroupOption.xml b/userGroupOption.xml
index 355eba5..fd3d19e 100644
--- a/userGroupOption.xml
+++ b/userGroupOption.xml
@@ -140,7 +140,7 @@
 			</option>
 			<option name="user.conversation.allowedAttachmentExtensions">
 				<categoryname>user.conversation</categoryname>
-				<optiontype>textarea</optiontype>
+				<optiontype>lineBreakSeparatedText</optiontype>
 				<defaultvalue>gif
 jpg
 jpeg
-- 
2.20.1