From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 15 Nov 2024 16:17:50 +0000 (+0100)
Subject: Merge branch '6.1' into 6.2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=23167422322adf2b6c52af07ac4d8f53f585ea20;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '6.1' into 6.2
---

23167422322adf2b6c52af07ac4d8f53f585ea20
diff --cc ts/global.d.ts
index 66ed95510d,547c356234..8f852c0283
--- a/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/lib/acp/form/UserMergeForm.class.php
index 00124ae78d,abc3589192..a9467be14f
--- a/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();