Merge branch 'release/4.3.6.1' into main

Author: brandonkelly

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Release Notes for Craft CMS 4
 
+## 4.3.6.1 - 2023-01-09
+
+- Element edit pages now retain their previous scroll position when they’re automatically refreshed to keep up with changes from another browser tab.
+- Fixed a bug where editing certain Matrix/Neo/Super Table fields could result in content loss. ([#12445](https://github.com/craftcms/cms/issues/12445))
+
 ## 4.3.6 - 2023-01-04
 
 - Template caching is no longer enabled for tokenized requests. ([#12458](https://github.com/craftcms/cms/issues/12458))

src/config/app.php

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

src/controllers/VolumesController.php

@@ -103,12 +103,6 @@ public function actionEditVolume(?int $volumeId = null, ?Volume $volume = null):
             ])
             ->all();
 
-        if (empty($fsOptions)) {
-            $fsOptions = [
-
-            ];
-        }
-
         return $this->asCpScreen()
             ->title($title)
             ->addCrumb(Craft::t('app', 'Settings'), 'settings')

src/helpers/Cp.php

@@ -125,6 +125,13 @@ public static function alerts(?string $path = null, bool $fetch = false): array
                 }
             }
 
+            if ($licenseKeyStatus === LicenseKeyStatus::Astray) {
+                // todo: swap Console link with a Resolve button
+                $alerts[] = Craft::t('app', 'Your Craft license isn’t allowed to run version {version}.', [
+                        'version' => Craft::$app->getVersion(),
+                    ]) . ' Please renew it from <a href="https://console.craftcms.com">Craft Console</a>.';
+            }
+
             // Any plugin issues?
             if ($path != 'settings/plugins') {
                 $pluginsService = Craft::$app->getPlugins();

src/translations/en/app.php

@@ -1775,6 +1775,7 @@
     'You need to be on at least {plugin} {version} before you can update to {plugin} {targetVersion}.' => 'You need to be on at least {plugin} {version} before you can update to {plugin} {targetVersion}.',
     'You need to reset your password, but an error was encountered when sending the password reset email.' => 'You need to reset your password, but an error was encountered when sending the password reset email.',
     'You need to reset your password. Check your email for instructions.' => 'You need to reset your password. Check your email for instructions.',
+    'Your Craft license isn’t allowed to run version {version}.' => 'Your Craft license isn’t allowed to run version {version}.',
     'Your Craft license key is invalid.' => 'Your Craft license key is invalid.',
     'Your Email' => 'Your Email',
     'Your account doesn’t have permission to access the control panel when the system is offline.' => 'Your account doesn’t have permission to access the control panel when the system is offline.',

src/web/assets/cp/dist/cp.js

@@ -189,6 +189,7 @@ Craft.ElementEditor = Garnish.Base.extend(
               ev.data.id === this.settings.canonicalId &&
               !this.settings.draftId)
           ) {
+            Craft.setLocalStorage('scrollY', window.scrollY);
             window.location.reload();
           } else if (
             ev.data.event === 'deleteDraft' &&
@@ -200,6 +201,7 @@ Craft.ElementEditor = Garnish.Base.extend(
             if (url.href !== document.location.href) {
               window.location.href = url;
             } else {
+              Craft.setLocalStorage('scrollY', window.scrollY);
               window.location.reload();
             }
           }
@@ -1620,13 +1622,7 @@ Craft.ElementEditor = Garnish.Base.extend(
                 'g'
               ),
               (m, pre, id, post) => {
-                let duplicate = false;
-                try {
-                  duplicate = this._filterFieldInputName(pre);
-                } catch (e) {
-                  console.warn(`Unexpected input name: ${m}`);
-                }
-                if (!duplicate) {
+                if (!this._filterFieldInputName(pre)) {
                   return m;
                 }
                 return pre + this.duplicatedElements[id] + post;
@@ -1638,17 +1634,12 @@ Craft.ElementEditor = Garnish.Base.extend(
               (m, name, id) => {
                 // Ignore param names that end in `[enabled]`, `[type]`, etc.
                 // (`[sortOrder]` should pass here, which could be set to a specific order index, but *not* `[sortOrder][]`!)
-                let duplicate = false;
-                try {
-                  duplicate =
-                    this._filterFieldInputName(name) &&
-                    !name.match(
-                      new RegExp(`${lb}(enabled|sortOrder|type|typeId)${rb}$`)
-                    );
-                } catch (e) {
-                  console.warn(`Unexpected input name: ${m}`);
-                }
-                if (!duplicate) {
+                if (
+                  !this._filterFieldInputName(name) ||
+                  name.match(
+                    new RegExp(`${lb}(enabled|sortOrder|type|typeId)${rb}$`)
+                  )
+                ) {
                   return m;
                 }
                 return `&${name}=${this.duplicatedElements[id]}`;
@@ -1666,13 +1657,13 @@ Craft.ElementEditor = Garnish.Base.extend(
       const lb = encodeURIComponent('[');
       const rb = encodeURIComponent(']');
       const nestedNames = name.match(
-        new RegExp(`(\\bfields|${lb}fields${rb})${lb}[^${rb}]+${rb}`, 'g')
+        new RegExp(`(\\bfields|${lb}fields${rb})${lb}.+?${rb}`, 'g')
       );
       if (!nestedNames) {
         throw `Unexpected input name: ${name}`;
       }
       const lastHandle = nestedNames[nestedNames.length - 1].match(
-        new RegExp(`(?:\\bfields|${lb}fields${rb})${lb}([^${rb}]+)${rb}`)
+        new RegExp(`(?:\\bfields|${lb}fields${rb})${lb}(.+?)${rb}`)
       )[1];
       return Craft.fieldsWithoutContent.includes(lastHandle);
     },