Merge branch '6.1' into 6.2

Author: dtdesign

.github/workflows/d-ts.yml

@@ -49,7 +49,7 @@ jobs:
         set -x
         cd d.ts/
 
-        jq --argfile dependencies ../package.json '.dependencies = ($dependencies |.dependencies)' ./package.json \
+        jq --slurpfile dependencies ../package.json '.dependencies = ($dependencies[0] |.dependencies)' ./package.json \
           |sponge ./package.json
 
         if ! git diff --quiet package.json; then

com.woltlab.wcf/package.xml

@@ -5,8 +5,8 @@
 		<packagedescription>Free CMS and web-framework, designed for awesome websites and communities.</packagedescription>
 		<packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
 		<isapplication>1</isapplication>
-		<version>6.1.4 dev 1</version>
-		<date>2025-02-11</date>
+		<version>6.1.6</version>
+		<date>2025-03-21</date>
 	</packageinformation>
 
 	<authorinformation>
@@ -50,10 +50,19 @@
 		<instruction type="script">acp/install_com.woltlab.wcf_step2.php</instruction>
 	</instructions>
 
-	<instructions type="update" fromversion="6.1.3">
-		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
+	<instructions type="update" fromversion="6.1.5">
 		<instruction type="file">files_update.tar</instruction>
 		<instruction type="template">templates_update.tar</instruction>
-		<instruction type="language"/>
+	</instructions>
+    <instructions type="update" fromversion="6.1.6 dev 1">
+		<instruction type="file">files_update.tar</instruction>
+		<instruction type="template">templates_update.tar</instruction>
+	</instructions>
+	<instructions type="update" fromversion="6.1.6 dev 2">
+		<instruction type="file">files_update.tar</instruction>
+		<instruction type="template">templates_update.tar</instruction>
+	</instructions>
+	<instructions type="update" fromversion="6.1.6 dev 3">
+		<instruction type="file">files_update.tar</instruction>
 	</instructions>
 </package>

com.woltlab.wcf/templates/shared_buttonFormField.tpl

@@ -2,7 +2,7 @@
 	*}type="submit" {*
 	*}id="{$field->getPrefixedId()}" {*
 	*}name="{$field->getPrefixedId()}" {*
-	*}value="{$field->getValue()}"{*
+	*}value="{$field->getValue()}" {*
 	*}class="button {implode from=$field->getFieldClasses() item='class' glue=' '}{$class}{/implode}"{*
 	*}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
 *}>{$field->getButtonLabel()}</button>

com.woltlab.wcf/templates/shared_multilineTextFormField.tpl

@@ -12,7 +12,7 @@
 	*}{if $field->getInputMode() !== null} inputmode="{$field->getInputMode()}"{/if}{*
 	*}{if $field->getPlaceholder() !== null} placeholder="{$field->getPlaceholder()}"{/if}{*
 	*}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
-*}>{$field->getValue()}</textarea>
+*}>{if !$field->isI18n() || !$field->hasI18nValues() || $availableLanguages|count === 1}{$field->getValue()}{/if}</textarea>
 
 {if $field->isI18n()}
 	{include file='shared_multipleLanguageInputJavascript'}