Merge branch '6.2' into 6.3

Author: BurntimeX

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.2.1 dev 1</version>
-		<date>2026-03-02</date>
+		<version>6.2.1 dev 2</version>
+		<date>2026-03-06</date>
 	</packageinformation>
 
 	<authorinformation>
@@ -98,10 +98,9 @@ tar cvf com.woltlab.wcf/files_pre_check.tar -C wcfsetup/install/files/ \
 		<instruction type="script">acp/update_com.woltlab.wcf_6.2_cleanUpDsStore.php</instruction>
 	</instructions>
 
-	<instructions type="update" fromversion="6.2.0">
+	<instructions type="update" fromversion="6.2.1 dev 1">
 		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
 		<instruction type="file">files_update.tar</instruction>
 		<instruction type="template">templates_update.tar</instruction>
-		<instruction type="language"/>
 	</instructions>
 </package>

com.woltlab.wcf/templates/shared_benchmark.tpl

@@ -1,5 +1,5 @@
 <div class="benchmark">
-	{if ENABLE_DEBUG_MODE}<button class="benchmarkDetailsButton">{/if}
+	{if ENABLE_DEBUG_MODE}<button type="button" class="benchmarkDetailsButton">{/if}
 		Execution time: {$__wcf->getBenchmark()->getExecutionTime()}s ({#($__wcf->getBenchmark()->getExecutionTime()-$__wcf->getBenchmark()->getQueryExecutionTime())/$__wcf->getBenchmark()->getExecutionTime()*100}% PHP, {#$__wcf->getBenchmark()->getQueryExecutionTime()/$__wcf->getBenchmark()->getExecutionTime()*100}% SQL) | SQL queries: {#$__wcf->getBenchmark()->getQueryCount()} | Memory-Usage: {$__wcf->getBenchmark()->getMemoryUsage()}
 	{if ENABLE_DEBUG_MODE}</button>{/if}
 

ts/WoltLabSuite/Core/Component/Image/Cropper.ts

@@ -357,7 +357,7 @@ class ExactImageCropper extends ImageCropper {
 
     if (sizes.length === 0) {
       const smallestSize =
-        this.configuration.sizes.length > 1 ? this.configuration.sizes[this.configuration.sizes.length - 1] : undefined;
+        this.configuration.sizes.length > 0 ? this.configuration.sizes[this.configuration.sizes.length - 1] : undefined;
       throw new Error(
         getPhrase("wcf.upload.error.image.tooSmall", {
           width: smallestSize?.width,

ts/WoltLabSuite/Core/Component/Quote/Message.ts

@@ -631,12 +631,13 @@ function getElementBoundaries(selection: Selection | null): ElementBoundaries {
   const rect = selection.getRangeAt(0).getBoundingClientRect();
 
   const scrollTop = window.scrollY;
+
   return {
     bottom: rect.bottom + scrollTop,
     height: rect.height,
     left: rect.left,
     right: rect.right,
     top: rect.top + scrollTop,
-    width: rect.height,
+    width: rect.width,
   };
 }

ts/WoltLabSuite/Core/Component/Quote/Storage.ts

@@ -171,7 +171,7 @@ export function clearQuotesForEditor(editorId: string): void {
   usedQuotes.get(editorId)?.forEach((uuid) => {
     for (const [key, quotes] of storage.quotes) {
       const quote = quotes.get(uuid);
-      if (quote?.rawMessage !== null) {
+      if (quote !== undefined && quote.rawMessage !== null) {
         fullQuotes.push(key);
       }
 
@@ -207,7 +207,7 @@ function storeQuote(objectType: string, message: Message, quote: Quote): string
   storage.messages.set(key, message);
 
   for (const [uuid, q] of storage.quotes.get(key)!) {
-    if ((q.rawMessage !== null && q.rawMessage === null) || q.message === quote.message) {
+    if ((q.rawMessage !== null && q.rawMessage === quote.rawMessage) || q.message === quote.message) {
       return uuid;
     }
   }

wcfsetup/install/files/acp/templates/boxList.tpl

@@ -8,7 +8,7 @@
 	<nav class="contentHeaderNavigation">
 		<ul>
 			<li>
-				<button class="button jsButtonBoxAdd">
+				<button type="button" class="button jsButtonBoxAdd">
 					{icon name='plus'}
 					<span>{lang}wcf.acp.box.add{/lang}</span>
 				</button>

wcfsetup/install/files/acp/templates/devtoolsProjectSync.tpl

@@ -10,7 +10,7 @@
 		<ul>
 			{if $object->validate() === ''}
 				<li>
-					<button class="button" id="devtoolsSyncAll">
+					<button type="button" class="button" id="devtoolsSyncAll">
 						{icon name='arrows-rotate' type='solid'}
 						{lang}wcf.acp.devtools.sync.syncAll{/lang}
 					</button>

wcfsetup/install/files/acp/templates/packageUpdateUnauthorizedPaidUpgrade.tpl

@@ -5,5 +5,5 @@
 </section>
 <div class="formSubmit">
 	<a href="https://pluginstore.woltlab.com/file/{$pluginStoreFileID}" target="_blank" class="button buttonPrimary">{lang}wcf.acp.package.update.purchaseRequired.button.purchase{/lang}</a>
-	<button style="display: none">{* dummy button for compatibility with the JS module *}</button>
-</div>
+	<button type="button" style="display: none">{* dummy button for compatibility with the JS module *}</button>
+</div>

wcfsetup/install/files/acp/templates/pageList.tpl

@@ -8,7 +8,7 @@
 	<nav class="contentHeaderNavigation">
 		<ul>
 			<li>
-				<button class="button jsButtonPageAdd">
+				<button type="button" class="button jsButtonPageAdd">
 					{icon name='plus'}
 					<span>{lang}wcf.acp.page.add{/lang}</span>
 				</button>

wcfsetup/install/files/acp/templates/rebuildData.tpl

@@ -26,7 +26,7 @@
 
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><button class="button jsRebuildAll">{icon name='down-long'} <span>{lang}wcf.acp.rebuildData.rebuildAll{/lang}</span></button></li>
+			<li><button type="button" class="button jsRebuildAll">{icon name='down-long'} <span>{lang}wcf.acp.rebuildData.rebuildAll{/lang}</span></button></li>
 			{event name='contentHeaderNavigation'}
 		</ul>
 	</nav>
@@ -49,9 +49,10 @@
 		<dl class="wide">
 			<dd>
 				<button
-				   class="button small jsRebuildDataWorker"
-				   data-nicevalue="{$offset}"
-				   data-class-name="{$worker->getClassName()}"
+					type="button"
+					class="button small jsRebuildDataWorker"
+					data-nicevalue="{$offset}"
+					data-class-name="{$worker->getClassName()}"
 				>{$worker->getName()}</button>
 				<small>{$worker->getDescription()}</small>
 			</dd>