Merge branch '4.x' of https://github.com/craftcms/cms into 5.x

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release Notes for Craft CMS 5
 
+## Unreleased
+
+- Fixed a bug where the `utils/fix-field-layout-uids` command was misidentifying missing/duplicate UUID issues.
+
 ## 5.4.10.1 - 2024-11-07
 
 - Fixed a bug where it wasn’t possible to create new nested Matrix entries for global sets. ([#16041](https://github.com/craftcms/cms/issues/16041))

src/console/controllers/utils/FixFieldLayoutUidsController.php

@@ -101,9 +101,9 @@ private function _fixUidsInLayout(
     private function _checkUid(array &$config, int &$count, array &$uids, bool &$modified, string $path): void
     {
         if (empty($config['uid'])) {
-            $reason = 'Duplicate UUID found at';
+            $reason = 'Missing UUID found at';
         } elseif (isset($uids[$config['uid']])) {
-            $reason = 'Missing UUID at';
+            $reason = 'Duplicate UUID at';
         } else {
             $uids[$config['uid']] = true;
             return;

src/models/Section.php

@@ -110,7 +110,7 @@ public static function get(int|string $id): ?static
      *  - [[PropagationMethod::None]] – Only save entries in the site they were created in
      *  - [[PropagationMethod::SiteGroup]] – Save  entries to other sites in the same site group
      *  - [[PropagationMethod::Language]] – Save entries to other sites with the same language
-     *  - [[PropagationMethod::Custom]] – Save entries to other sites based on a custom [[$propagationKeyFormat|propagation key format]]
+     *  - [[PropagationMethod::Custom]] – Let each entry choose which sites it should be saved to
      *  - [[PropagationMethod::All]] – Save entries to all sites supported by the owner element
      *
      * @since 3.2.0