From e4438c90a4c88b71c36c83bc536f7effdddd0297 Mon Sep 17 00:00:00 2001 From: brandonkelly Date: Thu, 23 Jun 2022 10:13:42 -0700 Subject: [PATCH 1/4] Ignore source resource files --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 54dae051ec9..e62587f41ca 100644 --- a/.gitattributes +++ b/.gitattributes @@ -40,6 +40,7 @@ /src/web/assets/**/dist/**/*.css.map linguist-generated=true /src/web/assets/**/dist/**/*.min.js linguist-generated=true /src/web/assets/**/dist/**/*.min.js.map linguist-generated=true +/src/web/assets/**/src/ export-ignore /tests/ export-ignore # Auto detect text files and perform LF normalization From e802918e411d4209cbafbb583af6f621485a03d3 Mon Sep 17 00:00:00 2001 From: brandonkelly Date: Fri, 24 Jun 2022 07:29:10 -0700 Subject: [PATCH 2/4] Fixed #11493 --- CHANGELOG.md | 5 +++++ src/fields/BaseRelationField.php | 9 +++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 047130ed1ca..7812716dc23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Release Notes for Craft CMS 3.x +## Unreleased + +### Fixed +- Fixed a SQL error that could occur on MySQL 5. ([#11493](https://github.com/craftcms/cms/issues/11493)) + ## 3.7.45.1 - 2022-06-21 ### Fixed diff --git a/src/fields/BaseRelationField.php b/src/fields/BaseRelationField.php index a1f254c366e..45500a50e64 100644 --- a/src/fields/BaseRelationField.php +++ b/src/fields/BaseRelationField.php @@ -500,11 +500,7 @@ public function modifyElementsQuery(ElementQueryInterface $query, $value) 'exists', (new Query()) ->from(["relations_$ns" => DbTable::RELATIONS]) ->innerJoin(["elements_$ns" => DbTable::ELEMENTS], "[[elements_$ns.id]] = [[relations_$ns.targetId]]") - ->leftJoin(["elements_sites_$ns" => DbTable::ELEMENTS_SITES], [ - 'and', - "[[elements_sites_$ns.elementId]] = [[elements_$ns.id]]", - ["elements_sites_$ns.siteId" => $this->_targetSiteId() ?? new Expression('[[elements_sites.siteId]]')], - ]) + ->leftJoin(["elements_sites_$ns" => DbTable::ELEMENTS_SITES], "[[elements_sites_$ns.elementId]] = [[elements_$ns.id]]") ->where("[[relations_$ns.sourceId]] = [[elements.id]]") ->andWhere([ 'or', @@ -515,8 +511,9 @@ public function modifyElementsQuery(ElementQueryInterface $query, $value) "relations_$ns.fieldId" => $this->id, "elements_$ns.enabled" => true, "elements_$ns.dateDeleted" => null, + "elements_sites_$ns.siteId" => $this->_targetSiteId() ?? new Expression('[[elements_sites.siteId]]'), + "elements_sites_$ns.enabled" => true, ]) - ->andWhere(['not', ["elements_sites_$ns.enabled" => false]]), ]; if ($emptyCondition === ':notempty:') { From 8b58966321d2871691ce444d2a7b3f87fcf863fe Mon Sep 17 00:00:00 2001 From: brandonkelly Date: Fri, 24 Jun 2022 07:57:12 -0700 Subject: [PATCH 3/4] Make sure yiisoft/yii2-composer is allowed Fixes #11399 --- CHANGELOG.md | 1 + src/services/Composer.php | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7812716dc23..1fe220f1cc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Fixed - Fixed a SQL error that could occur on MySQL 5. ([#11493](https://github.com/craftcms/cms/issues/11493)) +- Fixed a bug where Craft’s Composer commands weren’t ensuring that `config.allow-plugins.yiisoft/yii2-composer` was `true` in `composer.json`. ([#11399](https://github.com/craftcms/cms/issues/11399)) ## 3.7.45.1 - 2022-06-21 diff --git a/src/services/Composer.php b/src/services/Composer.php index 187f0f41a19..3a38b3940ca 100644 --- a/src/services/Composer.php +++ b/src/services/Composer.php @@ -386,6 +386,7 @@ protected function ensurePluginInstallerIsAllowed(string $jsonPath): void 'config' => [ 'allow-plugins' => [ 'craftcms/plugin-installer' => true, + 'yiisoft/yii2-composer' => true, ], ], ]); From b4fe5c883047927efc1e89e9d433eaa40a9c5681 Mon Sep 17 00:00:00 2001 From: brandonkelly Date: Fri, 24 Jun 2022 08:13:13 -0700 Subject: [PATCH 4/4] Finish 3.7.45.2 --- CHANGELOG.md | 2 +- composer.json | 2 +- src/config/app.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fe220f1cc8..75eb26f5566 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Release Notes for Craft CMS 3.x -## Unreleased +## 3.7.45.2 - 2022-06-24 ### Fixed - Fixed a SQL error that could occur on MySQL 5. ([#11493](https://github.com/craftcms/cms/issues/11493)) diff --git a/composer.json b/composer.json index 6e60e0d7cf2..1b28b49f882 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "craftcms/cms", "description": "Craft CMS", - "version": "3.7.45.1", + "version": "3.7.45.2", "keywords": [ "cms", "craftcms", diff --git a/src/config/app.php b/src/config/app.php index e0588f79fb4..c7adaa82321 100644 --- a/src/config/app.php +++ b/src/config/app.php @@ -3,7 +3,7 @@ return [ 'id' => 'CraftCMS', 'name' => 'Craft CMS', - 'version' => '3.7.45.1', + 'version' => '3.7.45.2', 'schemaVersion' => '3.7.33', 'minVersionRequired' => '2.6.2788', 'basePath' => dirname(__DIR__), // Defines the @app alias