Merge branch '6.1' into 6.2

diff --cc ts/WoltLabSuite/Core/BootstrapFrontend.ts
Simple merge

diff --cc ts/global.d.ts
index 66ed95510d2bf58f9af3ac61bbd84bc2d0c6b20c,547c3562344475dc440f164326754b5fc442ad42..8f852c0283366b0e14f818b355a6e04b28c43858
--- 1/ts/global.d.ts
--- 2/ts/global.d.ts
+++ b/ts/global.d.ts
@@@ -138,10 -140,10 +146,11 @@@ declare global 
      "woltlab-core-date-time": WoltlabCoreDateTime;
      "woltlab-core-file": WoltlabCoreFileElement;
      "woltlab-core-file-upload": WoltlabCoreFileUploadElement;
 +    "woltlab-core-google-maps": WoltlabCoreGoogleMapsElement;
      "woltlab-core-loading-indicator": WoltlabCoreLoadingIndicatorElement;
+     "woltlab-core-notice": WoltlabCoreNoticeElement;
      "woltlab-core-pagination": WoltlabCorePaginationElement;
 -    "woltlab-core-google-maps": WoltlabCoreGoogleMapsElement;
      "woltlab-core-reaction-summary": WoltlabCoreReactionSummaryElement;
 +    "woltlab-core-toggle-button": WoltlabCoreToggleButtonElement;
    }
  }

diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/BootstrapFrontend.js
Simple merge

diff --cc wcfsetup/install/files/lib/acp/form/DataImportForm.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/acp/form/UserMergeForm.class.php
index 00124ae78db35f0ed817aaefadd1b69d1b70b704,abc358919200f3cf6de587289a2b02465032ec24..a9467be14f4266d6d21e1ba07c34e349b234187d
--- 1/wcfsetup/install/files/lib/acp/form/UserMergeForm.class.php
--- 2/wcfsetup/install/files/lib/acp/form/UserMergeForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserMergeForm.class.php
@@@ -266,12 -266,21 +266,21 @@@ class UserMergeForm extends AbstractFor
          // user notifications
          $conditions = new PreparedStatementConditionBuilder();
          $conditions->add("authorID IN (?)", [$this->mergedUserIDs]);
 -        $sql = "UPDATE IGNORE   wcf" . WCF_N . "_user_notification_author
 +        $sql = "UPDATE IGNORE   wcf1_user_notification_author
                  SET             authorID = ?
                  " . $conditions;
 -        $statement = WCF::getDB()->prepareStatement($sql);
 +        $statement = WCF::getDB()->prepare($sql);
          $statement->execute(\array_merge([$this->destinationUserID], $conditions->getParameters()));
  
+         // articles
+         $conditions = new PreparedStatementConditionBuilder();
+         $conditions->add("userID IN (?)", [$this->mergedUserIDs]);
+         $sql = "UPDATE  wcf" . WCF_N . "_article
+                 SET     userID = ?
+                 " . $conditions;
+         $statement = WCF::getDB()->prepareStatement($sql);
+         $statement->execute(\array_merge([$this->destinationUserID], $conditions->getParameters()));
+ 
          // delete merged users
          $action = new UserAction($this->mergedUserIDs, 'delete');
          $action->executeAction();

diff --cc wcfsetup/install/files/lib/system/cronjob/DailyMailNotificationCronjob.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/user/notification/UserNotificationHandler.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php
Simple merge

diff --cc wcfsetup/install/files/style/ckeditor5.css
Simple merge

diff --cc wcfsetup/install/lang/de.xml
Simple merge

diff --cc wcfsetup/install/lang/en.xml
Simple merge