Merge branch 'release/4.4.7' into main

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Release Notes for Craft CMS 4
 
+## 4.4.7 - 2023-04-11
+
+- Improved the control panel styling when the Debug Toolbar is enabled.
+- The image transformer now verifies that transforms don’t exist if the index record is missing, before queuing up the transform generation, for local filesystems. ([#13052](https://github.com/craftcms/cms/issues/13052))
+- Added the `--propagate-to` and `--set-enabled-for-site` options to the `resave/entries` command.
+- Craft’s bootstrap script now defines a `CRAFT_ENVIRONMENT` environment variable, as a safety measure for plugins that may be checking for it rather than `Craft::$app->env`.
+- Added `craft\helpers\ElementHelper::siteStatusesForElement()`.
+- `craft\elements\Asset::EVENT_BEFORE_DEFINE_URL` now sends a `craft\events\DefineAssetUrlEvent` object, rather than `craft\events\DefineUrlEvent`. ([#13018](https://github.com/craftcms/cms/issues/13018))
+- `craft\web\View::renderObjectTemplate()` now trims the returned template output.
+- Fixed a bug where users were “View other users’ drafts” section permissions weren’t being enforced for unpublished drafts.
+- Fixed a bug where Matrix fields weren’t counting disabled blocks when enforcing their Min Blocks settings. ([#13059](https://github.com/craftcms/cms/issues/13059))
+- Fixed a bug where volume folder modals’ sidebars and content were being cut off. ([#13074](https://github.com/craftcms/cms/issues/13074))
+- Fixed a bug where element editors were showing provisional changes, even if the user didn’t have permission to save them.
+- Fixed a bug where the control panel could be inaccessible if a mutex lock couldn’t be acquired for the queue. ([#13052](https://github.com/craftcms/cms/issues/13052))
+- Fixed a bug where it wasn’t possible to update a Matrix block on a revision without a new block ID being assigned. ([#13064](https://github.com/craftcms/cms/discussions/13064))
+- Fixed a JavaScript error that could occur on field layout designers, if any tabs didn’t have any elements. ([#13062](https://github.com/craftcms/cms/issues/13062))
+- Fixed a bug where selecting an image with a transform within an asset selector modal wasn’t ever resolving.
+- Fixed a PHP error that could occur if there was a problem sending a password-reset email. ([#13070](https://github.com/craftcms/cms/pull/13070))
+- Fixed a bug where users’ User Groups and Permissions settings were getting cleared in the UI when sending an activation email, if the email failed to send. ([#13061](https://github.com/craftcms/cms/issues/13061))
+- Fixed XSS vulnerabilities.
+- Updated yii2-debug to 2.1.22. ([#13058](https://github.com/craftcms/cms/issues/13058))
+
 ## 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))

bootstrap/bootstrap.php

@@ -24,10 +24,6 @@
     throw new Exception('$appType must be set to "web" or "console".');
 }
 
-$findConfig = function($cliName, $envName) {
-    return App::cliOption($cliName, true) ?? App::env($envName);
-};
-
 $createFolder = function($path) {
     // Code borrowed from Io...
     if (!is_dir($path)) {
@@ -45,8 +41,8 @@
     }
 };
 
-$findConfigPath = function($cliName, $envName) use ($findConfig, $createFolder) {
-    $path = $findConfig($cliName, $envName);
+$findConfigPath = function($cliName, $envName) use ($createFolder) {
+    $path = App::cliOption($cliName, true) ?? App::env($envName);
     if (!$path) {
         return null;
     }
@@ -90,7 +86,11 @@
 $testsPath = $findConfigPath('--testsPath', 'CRAFT_TESTS_PATH') ?? "$rootPath/tests";
 
 // Set the environment
-$environment = $findConfig('--env', 'CRAFT_ENVIRONMENT') ?? $_SERVER['SERVER_NAME'] ?? null;
+$environment = App::cliOption('--env', true)
+    ?? App::env('CRAFT_ENVIRONMENT')
+    ?? App::env('ENVIRONMENT')
+    ?? $_SERVER['SERVER_NAME']
+    ?? null;
 
 // Validate the paths
 // -----------------------------------------------------------------------------

composer.json

@@ -59,7 +59,7 @@
     "voku/stringy": "^6.4.0",
     "webonyx/graphql-php": "~14.11.5",
     "yiisoft/yii2": "~2.0.47.0",
-    "yiisoft/yii2-debug": "~2.1.19.0",
+    "yiisoft/yii2-debug": "~2.1.22.0",
     "yiisoft/yii2-queue": "~2.3.2",
     "yiisoft/yii2-symfonymailer": "^2.0.0"
   },