Merge branch '4.x' into 4.10

craftcms · May 2, 2024 · 94b6fcd · 94b6fcd
2 parents e2e0d23 + 6405731
commit 94b6fcd
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Release Notes for Craft CMS 4
 
-## Unreleased
+## 4.9.1 - 2024-05-02
+
+- Fixed a bug where disclosure menus weren’t releasing their `scroll` and `resize` event listeners on hide. ([#14911](https://github.com/craftcms/cms/pull/14911]), [#14510](https://github.com/craftcms/cms/issues/14510))
+- Fixed a bug where MySQL backups weren’t restorable on certain environments. ([#14925](https://github.com/craftcms/cms/pull/14925))
+- Fixed a bug where `app/resource-js` requests weren’t working for guest requests. ([#14908](https://github.com/craftcms/cms/issues/14908))
+
+## 4.9.0 - 2024-04-30
 
 ### Content Management
 - It’s now possible to preview revisions. ([#14521](https://github.com/craftcms/cms/discussions/14521))
@@ -37,6 +43,7 @@
 - Fixed a bug where `craft\elements\db\ElementQuery::count()` could return the wrong number if the query had a cached result, with `offset` or `limit` params.
 - Console requests no longer filter out info logs. ([#14280](https://github.com/craftcms/cms/issues/14280), [#14434](https://github.com/craftcms/cms/pull/14434))
 - Fixed a styling issue with Categories and Entries fields when “Maintain Hierarchy” was enabled.
+- Fixed a bug where Delete actions weren’t working in admin tables. ([craftcms/commerce#3444](https://github.com/craftcms/commerce/issues/3444))
 
 ## 4.8.11 - 2024-04-29
 

diff --git a/packages/craftcms-vue/admintable/App.vue b/packages/craftcms-vue/admintable/App.vue
@@ -816,7 +816,7 @@
             label: Craft.t('app', 'Delete'),
             action: this.deleteAction,
             error: true,
-            ajax: true,
+            ajax: this.tableDataEndpoint ? true : false,
             allowMultiple: this.allowMultipleDeletions,
             separator: itemActions.length ? true : false,
           });

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

diff --git a/src/controllers/AppController.php b/src/controllers/AppController.php
@@ -54,6 +54,7 @@ class AppController extends Controller
         'migrate' => self::ALLOW_ANONYMOUS_LIVE | self::ALLOW_ANONYMOUS_OFFLINE,
         'broken-image' => self::ALLOW_ANONYMOUS_LIVE | self::ALLOW_ANONYMOUS_OFFLINE,
         'health-check' => self::ALLOW_ANONYMOUS_LIVE,
+        'resource-js' => self::ALLOW_ANONYMOUS_LIVE | self::ALLOW_ANONYMOUS_OFFLINE,
     ];
 
     /**

diff --git a/src/db/mysql/Schema.php b/src/db/mysql/Schema.php
@@ -173,8 +173,8 @@ public function getDefaultBackupCommand(?array $ignoreTables = null): string
 
         // https://bugs.mysql.com/bug.php?id=109685
         $useSingleTransaction =
-            ($isMySQL5 && version_compare($serverVersion, '5.7.41', '>=')) ||
-            ($isMySQL8 && version_compare($serverVersion, '8.0.32', '>='));
+            ($isMySQL5 && version_compare($serverVersion, '5.7.41', '<')) ||
+            ($isMySQL8 && version_compare($serverVersion, '8.0.32', '<'));
 
         if ($useSingleTransaction) {
             $baseCommand->addArg('--single-transaction');

diff --git a/src/web/assets/admintable/dist/css/app.css b/src/web/assets/admintable/dist/css/app.css
diff --git a/src/web/assets/admintable/dist/css/app.css.map b/src/web/assets/admintable/dist/css/app.css.map
diff --git a/src/web/assets/admintable/dist/js/app.js b/src/web/assets/admintable/dist/js/app.js
diff --git a/src/web/assets/admintable/dist/js/app.js.map b/src/web/assets/admintable/dist/js/app.js.map
diff --git a/src/web/assets/admintable/dist/manifest.json b/src/web/assets/admintable/dist/manifest.json
@@ -1 +1 @@
-{"app.css":"/css/app.css","app.js":"/js/app.js","app.js.map":"/js/app.js.map"}
+{"app.css":"/css/app.css","app.js":"/js/app.js","app.css.map":"/css/app.css.map","app.js.map":"/js/app.js.map"}
diff --git a/src/web/assets/garnish/dist/garnish.js b/src/web/assets/garnish/dist/garnish.js
diff --git a/src/web/assets/garnish/dist/garnish.js.map b/src/web/assets/garnish/dist/garnish.js.map
diff --git a/src/web/assets/garnish/src/DisclosureMenu.js b/src/web/assets/garnish/src/DisclosureMenu.js
@@ -264,6 +264,8 @@ export default Base.extend(
       }
 
       this.trigger('hide');
+      this.removeListener(Garnish.$scrollContainer, 'scroll');
+      this.removeListener(Garnish.$win, 'resize');
       Garnish.uiLayerManager.removeLayer();
     },
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"app.css":"/css/app.css","app.js":"/js/app.js","app.js.map":"/js/app.js.map"}
		{"app.css":"/css/app.css","app.js":"/js/app.js","app.css.map":"/css/app.css.map","app.js.map":"/js/app.js.map"}