Merge branch 'release/3.6.5.1' into main

craftcms · Feb 10, 2021 · 076c414 · 076c414
2 parents 154bd67 + acb1d4e
commit 076c414
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Release Notes for Craft CMS 3.x
 
+## 3.6.5.1 - 2021-02-10
+
+### Fixed
+- Fixed a bug where all fields were getting assigned to a field group on save, even if they weren’t global. ([#7540](https://github.com/craftcms/cms/issues/7540))
+
 ## 3.6.5 - 2021-02-10
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "craftcms/cms",
   "description": "Craft CMS",
-  "version": "3.6.5",
+  "version": "3.6.5.1",
   "keywords": [
     "cms",
     "craftcms",

diff --git a/src/config/app.php b/src/config/app.php
@@ -3,7 +3,7 @@
 return [
     'id' => 'CraftCMS',
     'name' => 'Craft CMS',
-    'version' => '3.6.5',
+    'version' => '3.6.5.1',
     'schemaVersion' => '3.6.2',
     'minVersionRequired' => '2.6.2788',
     'basePath' => dirname(__DIR__), // Defines the @app alias

diff --git a/src/services/Fields.php b/src/services/Fields.php
@@ -1616,7 +1616,7 @@ public function applyFieldSave(string $fieldUid, array $data, string $context)
 
         try {
             $fieldRecord = $this->_getFieldRecord($fieldUid);
-            $groupRecord = $this->_getGroupRecord($groupUid);
+            $groupRecord = $groupUid ? $this->_getGroupRecord($groupUid) : null;
             $isNewField = $fieldRecord->getIsNewRecord();
             $oldSettings = $fieldRecord->getOldAttribute('settings');
 
@@ -1700,7 +1700,7 @@ public function applyFieldSave(string $fieldUid, array $data, string $context)
             }
 
             $fieldRecord->uid = $fieldUid;
-            $fieldRecord->groupId = $groupRecord->id;
+            $fieldRecord->groupId = $groupRecord->id ?? null;
             $fieldRecord->name = $data['name'];
             $fieldRecord->handle = $data['handle'];
             $fieldRecord->context = $context;
@@ -1890,7 +1890,7 @@ private function _createLayoutTabQuery(): Query
     /**
      * Gets a field group record or creates a new one.
      *
-     * @param mixed $criteria ID or UID of the field group.
+     * @param int|string $criteria ID or UID of the field group.
      * @param bool $withTrashed Whether to include trashed field groups in search
      * @return FieldGroupRecord
      */

diff --git a/src/translations/de-CH/app.php b/src/translations/de-CH/app.php