Merge branch 'release/4.4.6.1' into main

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release Notes for Craft CMS 4
 
+## 4.4.6.1 - 2023-04-04
+
+- Fixed a bug where Categories fields weren’t retaining custom sort orders when “Maintain hierarchy” was disabled. ([#10560](https://github.com/craftcms/cms/discussions/10560))
+
 ## 4.4.6 - 2023-04-04
 
 - Content tab menus now reveal when a tab contains validation errors, and invalid tabs’ menu options get the same warning icon treatment as inline tabs do. ([#12971](https://github.com/craftcms/cms/issues/12971))

src/config/app.php

@@ -3,7 +3,7 @@
 return [
     'id' => 'CraftCMS',
     'name' => 'Craft CMS',
-    'version' => '4.4.6',
+    'version' => '4.4.6.1',
     'schemaVersion' => '4.4.0.4',
     'minVersionRequired' => '3.7.11',
     'basePath' => dirname(__DIR__), // Defines the @app alias

src/controllers/RebrandController.php

@@ -102,7 +102,7 @@ public function actionDeleteSiteImage(): ?Response
         $type = $this->request->getRequiredBodyParam('type');
 
         if (!in_array($type, $this->_allowedTypes, true)) {
-            $this->asFailure(Craft::t('app', 'That is not an allowed image type.'));
+            return $this->asFailure(Craft::t('app', 'That is not an allowed image type.'));
         }
 
         FileHelper::clearDirectory(Craft::$app->getPath()->getRebrandPath() . '/' . $type);

src/fields/Categories.php

@@ -90,7 +90,7 @@ public function __construct(array $config = [])
      */
     public function normalizeValue(mixed $value, ?ElementInterface $element = null): mixed
     {
-        if (is_array($value)) {
+        if (is_array($value) && $this->maintainHierarchy) {
             /** @var Category[] $categories */
             $categories = Category::find()
                 ->siteId($this->targetSiteId($element))