Merge branch 'main' into default-avatar

Author: TheVillageGuy

src/DTO/UserSettingsDto.php

@@ -79,8 +79,8 @@ public function mergeIntoDto(UserSettingsDto $dto): UserSettingsDto
         $dto->addMentionsEntries = $this->addMentionsEntries ?? $dto->addMentionsEntries;
         $dto->addMentionsPosts = $this->addMentionsPosts ?? $dto->addMentionsPosts;
         $dto->homepage = $this->homepage ?? $dto->homepage;
-        $dto->frontDefaultSort = $this->frontDefaultSort;
-        $dto->commentDefaultSort = $this->commentDefaultSort;
+        $dto->frontDefaultSort = $this->frontDefaultSort ?? $dto->frontDefaultSort;
+        $dto->commentDefaultSort = $this->commentDefaultSort ?? $dto->commentDefaultSort;
         $dto->featuredMagazines = $this->featuredMagazines ?? $dto->featuredMagazines;
         $dto->preferredLanguages = $this->preferredLanguages ?? $dto->preferredLanguages;
         $dto->customCss = $this->customCss ?? $dto->customCss;