Merge branch 'release/3.4.44' into v3

nystudio107 · Nov 22, 2022 · 80b7d98 · 80b7d98
2 parents c2191bd + 1125837
commit 80b7d98
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # SEOmatic Changelog
 
+## 3.4.43 - 2022.11.22
+### Fixed
+* Fixed a regression in the SEO Settings field where the **Override** state for a field would not save ([#1239](https://github.com/nystudio107/craft-seomatic/issues/1239))
+
 ## 3.4.43 - 2022.11.20
 ### Changed
 * Better styling for the Robots focus ring

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "nystudio107/craft-seomatic",
   "description": "SEOmatic facilitates modern SEO best practices & implementation for Craft CMS 3. It is a turnkey SEO system that is comprehensive, powerful, and flexible.",
   "type": "craft-plugin",
-  "version": "3.4.43",
+  "version": "3.4.44",
   "keywords": [
     "craft",
     "cms",

diff --git a/src/templates/settings/_includes/fields/_inheritableField.twig b/src/templates/settings/_includes/fields/_inheritableField.twig
@@ -10,24 +10,24 @@
 <div class="inheritable-field {{ isInherited ? 'inherited-settings' : 'defined-settings' }}">
     <div class="field {{ wrapperClass|default('') }}" style="margin-top: 18px!important;">
         {% if pageContext == "field" %}
-        <div class="override">
-            {% namespace overrideNamespace|default("metaGlobalVars") %}
-                {{ forms.lightswitchField({
-                    on: not isInherited,
-                    onLabel: "Override"|t("seomatic"),
-                    offLabel: fieldLabel,
-                    warning: false,
-                    name: 'override-' ~ settingName|default(''),
-                    value: isInherited ? 0 : 1,
-                }) }}
-            {% endnamespace %}
-        </div>
+            <div class="override">
+                {% namespace overrideNamespace|default("metaGlobalVars") %}
+                    {{ forms.lightswitchField({
+                        on: not isInherited,
+                        onLabel: "Override"|t("seomatic"),
+                        offLabel: fieldLabel,
+                        warning: false,
+                        name: 'override-' ~ settingName|default(''),
+                        value: isInherited ? false : '1',
+                    }) }}
+                {% endnamespace %}
+            </div>
 
-        <div class="inherited value-wrapper">
-            {% block inheritedValues %}
+            <div class="inherited value-wrapper">
+                {% block inheritedValues %}
 
-            {% endblock %}
-        </div>
+                {% endblock %}
+            </div>
         {% else %}
             <div></div>
             <div class="field width-100 mt-1 mb-0">