Merge branch 'master' into next

diff --cc wcfsetup/install/files/lib/acp/action/UserExportGdprAction.class.php
Simple merge

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

diff --cc wcfsetup/install/files/lib/acp/form/UserTrophyAddForm.class.php
index 7a4d5884bfe004465a98b4bc1e8c1998f79bb221,4bd169916fed602c78148b6c20527bff13a54fb7..123041e5244899523b78e1057fe760558c7a155c
--- 1/wcfsetup/install/files/lib/acp/form/UserTrophyAddForm.class.php
--- 2/wcfsetup/install/files/lib/acp/form/UserTrophyAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserTrophyAddForm.class.php
@@@ -192,9 -184,10 +192,10 @@@ class UserTrophyAddForm extends Abstrac
        public function reset() {
                parent::reset();
                
-               $this->user = $this->userIDs = [];
+               $this->user = '';
+               $this->userIDs = [];
                $this->trophyID = '';
 -              $this->useCustomDescription = 0;
 +              $this->useCustomDescription = $this->trophyUseHtml = 0;
        }
        
        /**