Merge branch 'release/4.5.1' into main

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Release Notes for Craft CMS 4
 
+## 4.5.1 - 2023-08-23
+
+- Control panel notifications no longer block page keyboard shortcuts. ([#13591](https://github.com/craftcms/cms/issues/13591))
+- `Garnish.uiLayerManager.addLayer()` now supports a `bubble` option, which allows non-matching keyboard shortcuts to bubble up to the parent layer.
+- Fixed an error that could occur when Craft was performing a Composer operation, if no `HOME` environment variable was set for PHP. ([#13590](https://github.com/craftcms/cms/issues/13590))
+- Fixed a bug where `craft\fields\Matrix::serializeValue()` was setting `fields` keys to a closure. ([#13592](https://github.com/craftcms/cms/issues/13592))
+- Fixed a bug where time values weren’t saving properly for Greek locales. ([#9942](https://github.com/craftcms/cms/issues/9942))
+- Fixed a bug where the “Status” lightswitch would always be enabled on edit pages for single-site elements. ([#13595](https://github.com/craftcms/cms/issues/13595))
+
 ## 4.5.0 - 2023-08-22
 
 ### Content Management

src/config/app.php

@@ -3,7 +3,7 @@
 return [
     'id' => 'CraftCMS',
     'name' => 'Craft CMS',
-    'version' => '4.5.0',
+    'version' => '4.5.1',
     'schemaVersion' => '4.5.0.3',
     'minVersionRequired' => '3.7.11',
     'basePath' => dirname(__DIR__), // Defines the @app alias

src/controllers/ElementsController.php

@@ -108,7 +108,7 @@ public function beforeAction($action): bool
         $this->_draftId = $this->_param('draftId');
         $this->_revisionId = $this->_param('revisionId');
         $this->_siteId = $this->_param('siteId');
-        $this->_enabled = $this->_param('enabled') ?? true;
+        $this->_enabled = $this->_param('enabled', true);
         $this->_enabledForSite = $this->_param('enabledForSite');
         $this->_slug = $this->_param('slug');
         $this->_fresh = (bool)$this->_param('fresh');
@@ -135,11 +135,16 @@ public function beforeAction($action): bool
 
     /**
      * @param string $name
+     * @param mixed $default
      * @return mixed
      */
-    private function _param(string $name): mixed
+    private function _param(string $name, mixed $default = null): mixed
     {
-        return ArrayHelper::remove($this->_attributes, $name) ?? $this->request->getQueryParam($name);
+        $value = ArrayHelper::remove($this->_attributes, $name) ?? $this->request->getQueryParam($name);
+        if ($value === null && $default !== null && $this->request->getIsPost()) {
+            return $default;
+        }
+        return $value;
     }
 
     /**
@@ -1848,7 +1853,7 @@ private function _applyParamsToElement(ElementInterface $element): void
             }
 
             $element->setEnabledForSite($this->_enabledForSite);
-        } else {
+        } elseif (isset($this->_enabled)) {
             $element->enabled = $this->_enabled;
         }
 

src/fields/Matrix.php

@@ -575,7 +575,7 @@ public function serializeValue(mixed $value, ?ElementInterface $element = null):
                 'type' => $block->getType()->handle,
                 'enabled' => $block->enabled,
                 'collapsed' => $block->collapsed,
-                'fields' => fn() => $block->getSerializedFieldValues(),
+                'fields' => $block->getSerializedFieldValues(),
             ];
         }
 

src/helpers/DateTimeHelper.php

@@ -865,11 +865,25 @@ private static function _parseTime(string $value): array
         // Replace the localized "AM" and "PM"
         $am = $formattingLocale->getAMName();
         $pm = $formattingLocale->getPMName();
+        $m = [$am, $pm];
 
-        if (preg_match('/(.*)(' . preg_quote($am, '/') . '|' . preg_quote($pm, '/') . ')(.*)/iu', $value, $matches)) {
+        // account for AM/PM names that might be normalized for jQuery Timepicker
+        $amAlt = preg_replace('/[\s.]/', '', $am);
+        $pmAlt = preg_replace('/[\s.]/', '', $pm);
+
+        if ($amAlt !== $am) {
+            $m[] = $amAlt;
+        }
+        if ($pmAlt !== $pm) {
+            $m[] = $pmAlt;
+        }
+
+        $quoted = implode('|', array_map(fn($v) => preg_quote($v, '/'), $m));
+
+        if (preg_match("/(.*)($quoted)(.*)/iu", $value, $matches)) {
             $value = $matches[1] . $matches[3];
 
-            if (mb_strtolower($matches[2]) === mb_strtolower($am)) {
+            if (in_array(mb_strtolower($matches[2]), [mb_strtolower($am), mb_strtolower($amAlt)])) {
                 $value .= 'AM';
             } else {
                 $value .= 'PM';

src/services/Composer.php

@@ -197,7 +197,12 @@ private function runComposerCommand(IOInterface $io, string $jsonPath, array $co
             '--no-interaction',
         ]);
 
-        $process = new Process($command);
+        $homePath = Craft::$app->getPath()->getRuntimePath() . DIRECTORY_SEPARATOR . 'composer';
+        FileHelper::createDirectory($homePath);
+
+        $process = new Process($command, null, [
+            'COMPOSER_HOME' => $homePath,
+        ]);
         $process->setTimeout(null);
 
         try {

src/web/assets/cp/src/js/CP.js

@@ -1537,7 +1537,9 @@ Craft.CP.Notification = Garnish.Base.extend({
 
       this._hasUiElements = !!$detailsContainer.find('button,input');
       if (this._hasUiElements) {
-        Garnish.uiLayerManager.addLayer(this.$container);
+        Garnish.uiLayerManager.addLayer(this.$container, {
+          bubble: true,
+        });
         Garnish.uiLayerManager.registerShortcut(Garnish.ESC_KEY, () => {
           this.close();
         });