From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 10 Mar 2024 14:14:32 +0000 (+0100)
Subject: Merge branch '6.0'
X-Git-Tag: 6.1.0_Alpha_1~150
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=214fb5597cd416b5ab355dba85addec56e89afcd;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '6.0'
---

214fb5597cd416b5ab355dba85addec56e89afcd
diff --cc com.woltlab.wcf/templates/messageOptionType.tpl
index c176a4ea42,7e5127f116..3647f32462
--- a/com.woltlab.wcf/templates/messageOptionType.tpl
+++ b/com.woltlab.wcf/templates/messageOptionType.tpl
@@@ -1,5 -1,5 +1,5 @@@
- <textarea id="{$option->optionName}" name="values[{$option->optionName}]" cols="40" rows="10"{if $option->required} required{/if} class="wysiwygTextarea" data-disable-attachments="true">{$value}</textarea>
+ <textarea id="{$option->optionName}" name="values[{$option->optionName}]" cols="40" rows="10" class="wysiwygTextarea" data-disable-attachments="true">{$value}</textarea>
 -{include file='wysiwyg' wysiwygSelector=$option->optionName}
 +{include file='shared_wysiwyg' wysiwygSelector=$option->optionName}
  
  <script data-relocate="true">
  $(function() {
diff --cc wcfsetup/install/files/acp/templates/userAdd.tpl
index 4db76324ef,91d9ec924d..62ab6118f6
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@@ -520,7 -554,8 +520,8 @@@
  								</small>
  							{/if}
  
 -							{include file='wysiwyg' wysiwygSelector='signature'}
 +							{include file='shared_wysiwyg' wysiwygSelector='signature'}
+ 							{include file='messageFormTabs' wysiwygContainerID='signature'}
  						</dd>
  					</dl>
  
diff --cc wcfsetup/install/files/lib/acp/form/UserAddForm.class.php
index 1e9b727451,b538d04591..fd1094c61f
--- a/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php
@@@ -11,7 -14,7 +14,8 @@@ use wcf\system\database\util\PreparedSt
  use wcf\system\exception\UserInputException;
  use wcf\system\html\input\HtmlInputProcessor;
  use wcf\system\language\LanguageFactory;
+ use wcf\system\message\embedded\object\MessageEmbeddedObjectManager;
 +use wcf\system\option\user\UserOptionHandler;
  use wcf\system\request\LinkHandler;
  use wcf\system\WCF;
  use wcf\util\ArrayUtil;
@@@ -302,8 -358,14 +341,14 @@@ class UserAddForm extends UserOptionLis
          $this->signature = $this->disableSignatureReason = '';
          $this->groupIDs = [];
          $this->languageID = $this->getDefaultFormLanguageID();
 -        /** @noinspection PhpUndefinedMethodInspection */
 +        \assert($this->optionHandler instanceof UserOptionHandler);
          $this->optionHandler->resetOptionValues();
+         // Reload attachment handler to reset the uploaded attachments.
+         $this->attachmentHandler = new AttachmentHandler(
+             $this->attachmentObjectType,
+             $this->attachmentObjectID,
+             $this->tmpHash
+         );
      }
  
      /**
diff --cc wcfsetup/install/files/lib/acp/form/UserEditForm.class.php
index 594a816a79,36d29c391f..052a05cd94
--- a/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php
@@@ -16,8 -16,8 +16,9 @@@ use wcf\system\cache\runtime\UserProfil
  use wcf\system\exception\IllegalLinkException;
  use wcf\system\exception\PermissionDeniedException;
  use wcf\system\exception\UserInputException;
+ use wcf\system\message\embedded\object\MessageEmbeddedObjectManager;
  use wcf\system\moderation\queue\ModerationQueueManager;
 +use wcf\system\option\user\UserOptionHandler;
  use wcf\system\style\StyleHandler;
  use wcf\system\user\command\SetColorScheme;
  use wcf\system\user\multifactor\Setup;
diff --cc wcfsetup/install/lang/de.xml
index ecbda8bb96,58e10a641e..8cfd051fba
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@@ -1953,8 -1953,9 +1953,9 @@@ Die Datenbestände werden sorgfältig g
  		<item name="wcf.acp.package.validation.errorCode.28"><![CDATA[Die &lt;packageinformation&gt; enthalten das doppelte Element „{$tag}“.]]></item>
  		<item name="wcf.acp.package.validation.errorCode.29"><![CDATA[Es wurde keine Paketversion angegeben.]]></item>
  		<item name="wcf.acp.package.validation.errorCode.30"><![CDATA[Es wurde keine Paketdatum angegeben.]]></item>
+ 		<item name="wcf.acp.package.validation.errorCode.31"><![CDATA[Die Datei „package.xml“ ist ungültig{if $libxmlOutput}: {$libxmlOutput}{/if}.]]></item>
  		<item name="wcf.acp.package.validation.failed"><![CDATA[Das hochgeladene Paket kann nicht installiert werden, bitte {if LANGUAGE_USE_INFORMAL_VARIANT}beachte{else}beachten Sie{/if} das unten stehende Prüfungsergebnis.]]></item>
 -		<item name="wcf.acp.package.evaluation.expired"><![CDATA[Die Testphase von <strong>{$packageName}</strong> ist abgelaufen. Bitte aktualisiere{if !LANGUAGE_USE_INFORMAL_VARIANT}n Sie{/if} auf die aktuelle Version, um diese Software weiterhin legal betreiben zu können.{if $pluginStoreFileID || $isWoltLab}<br>{if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst{else}Sie können{/if} die aktuelle Version sicher und bequem <strong>{if $pluginStoreFileID}<a href="https://pluginstore.woltlab.com/file/{$pluginStoreFileID}/">im WoltLab Plugin-Store</a>{else}<a href="https://www.woltlab.com/de/kaufen/">auf WoltLab.com</a>{/if}</strong> erwerben.{/if}]]></item>
 +		<item name="wcf.acp.package.evaluation.expired"><![CDATA[Die Testphase von <strong>{$packageName}</strong> ist abgelaufen. {if $pluginStoreFileID || $isWoltLab}<br>{if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst{else}Sie können{/if} die aktuelle Version sicher und bequem <strong>{if $pluginStoreFileID}<a href="https://pluginstore.woltlab.com/file/{$pluginStoreFileID}/">im WoltLab Plugin-Store</a>{else}<a href="https://www.woltlab.com/de/kaufen/">auf WoltLab.com</a>{/if}</strong> erwerben.{/if}]]></item>
  		<item name="wcf.acp.package.evaluation.pending"><![CDATA[Bei den folgenden installierten Apps handelt es sich um Testversionen, die am <strong>{$evaluationEndDate|plainTime}</strong> ({@$evaluationEndDate|dateDiff:TIME_NOW:true}) ablaufen. Mit Ablauf der Frist deaktiviert sich die App automatisch, es ist dann notwendig diese auf die endgültige Version zu aktualisieren, um den legalen Betrieb fortzusetzen.
  <ul class="nativeList">
  	{foreach from=$pendingApps item=pendingApp}
diff --cc wcfsetup/install/lang/en.xml
index a1a976a470,db07c7fc71..dac14004be
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -1936,8 -1936,9 +1936,9 @@@ The database is carefully maintained, b
  		<item name="wcf.acp.package.validation.errorCode.28"><![CDATA[The &lt;packageinformation&gt; contain the duplicate child element “{$tag}”.]]></item>
  		<item name="wcf.acp.package.validation.errorCode.29"><![CDATA[No package version was given.]]></item>
  		<item name="wcf.acp.package.validation.errorCode.30"><![CDATA[No package date was given.]]></item>
+ 		<item name="wcf.acp.package.validation.errorCode.31"><![CDATA[The file “package.xml” is invalid{if $libxmlOutput}: {$libxmlOutput}{/if}.]]></item>
  		<item name="wcf.acp.package.validation.failed"><![CDATA[The package cannot be installed, please review the validation results below.]]></item>
 -		<item name="wcf.acp.package.evaluation.expired"><![CDATA[The evaluation period of <strong>{$packageName}</strong> has expired. For a legal use of this software, please update to the latest available version.{if $pluginStoreFileID || $isWoltLab}<br>The latest version can be purchased quickly and securely <strong>{if $pluginStoreFileID}<a href="https://pluginstore.woltlab.com/file/{$pluginStoreFileID}/">in the WoltLab Plugin-Store</a>{else}<a href="https://www.woltlab.com/en/purchase/">on WoltLab.com</a>{/if}</strong>.{/if}]]></item>
 +		<item name="wcf.acp.package.evaluation.expired"><![CDATA[The evaluation period of <strong>{$packageName}</strong> has expired. {if $pluginStoreFileID || $isWoltLab}<br>The latest version can be purchased quickly and securely <strong>{if $pluginStoreFileID}<a href="https://pluginstore.woltlab.com/file/{$pluginStoreFileID}/">in the WoltLab Plugin-Store</a>{else}<a href="https://www.woltlab.com/en/purchase/">on WoltLab.com</a>{/if}</strong>.{/if}]]></item>
  		<item name="wcf.acp.package.evaluation.pending"><![CDATA[The evaluation period of the apps listed below will expire on <strong>{$evaluationEndDate|plainTime}</strong> ({@$evaluationEndDate|dateDiff:TIME_NOW:true}). The apps will automatically disable themselves after this date and become unusable, you'll need to install the latest versions of the apps to active them again.
  <ul class="nativeList">
  	{foreach from=$pendingApps item=pendingApp}