Merge branch 'release/3.3.3'

studioespresso · Sep 18, 2023 · d0ca705 · d0ca705
2 parents a111101 + f8c9dfd
commit d0ca705
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 3.3.3 - 2023-09-18
+### Fixed
+- Fixed an error when using a custom meta template ([#81](https://github.com/studioespresso/craft-seo-fields/issues/81))
+
+
 ## 3.3.2 - 2023-09-13
 ### Fixed
 - Fixed an issue where sitemaps couldn't be saved for different sites

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "studioespresso/craft-seo-fields",
     "description": "Fields for your SEO & OG meta data",
     "type": "craft-plugin",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/models/SeoFieldModel.php b/src/models/SeoFieldModel.php
@@ -32,6 +32,16 @@ class SeoFieldModel extends Model
      */
     public $siteDefault;
 
+    public function init(): void
+    {
+        if ($this->siteId) {
+            $site = Craft::$app->getSites()->getSiteById($this->siteId);
+        } else {
+            $site = Craft::$app->getSites()->getCurrentSite();
+        }
+        $this->siteDefault = SeoFields::getInstance()->defaultsService->getDataBySite($site);
+    }
+
     public function getDefaults()
     {
         if ($this->siteId) {
@@ -74,7 +84,7 @@ public function getCanonical()
         return $request->hostInfo .'/' . $request->getPathInfo(true);
     }
 
-    public function getOgTitle($element)
+    public function getOgTitle($element = null)
     {
         if ($this->facebookTitle) {
             return $this->facebookTitle . $this->getSiteNameWithSeperator();
@@ -83,7 +93,7 @@ public function getOgTitle($element)
         }
     }
 
-    public function getTwitterTitle($element)
+    public function getTwitterTitle($element = null)
     {
         if ($this->twitterTitle) {
             return $this->twitterTitle . $this->getSiteNameWithSeperator();
@@ -154,7 +164,7 @@ public function getTwitterImage(Asset $asset = null)
         ];
     }
 
-    public function getAlternate($element)
+    public function getAlternate($element = null)
     {
         if (!$element) {
             return false;

diff --git a/src/services/RenderService.php b/src/services/RenderService.php
@@ -76,7 +76,7 @@ public function getSeoFromContent($context, $handle)
                 $meta = new SeoFieldModel();
             }
 
-            return ['meta' => $meta, 'entry' => $element];
+            return ['meta' => $meta, 'entry' => $element, 'element' => $element];
 
         } catch (\Exception $e) {
             return null;

diff --git a/src/templates/_meta.twig b/src/templates/_meta.twig
@@ -2,41 +2,43 @@
 
 {# Uncomment these lines when copying the template to your site templates #}
 {#{% set seoFields = getSeoFields() %}#}
+{#{% set element = seoFields.element %}#}
 {#{% set meta = seoFields.meta %}#}
 
 {% if meta %}
+
     <title>{{ meta.getPageTitle(element) }}</title>
     <meta name="description" content="{{ meta.getMetaDescription() }}">
     {# Facebook #}
     <meta property="og:url" content="{{ craft.app.request.absoluteUrl }}"/>
     <meta property="og:type" content="website"/>
-    <meta property="og:title" content="{{ meta.getOgTitle(element) }}"/>
-{% set ogImage = meta.getOgImage() %}
-{% if ogImage %}
-    <meta property="og:image" content="{{ ogImage.url }}"/>
-    <meta property="og:image:width" content="{{ ogImage.width }}"/>
-    <meta property="og:image:height" content="{{ ogImage.height }}"/>
-    <meta property="og:image:alt" content="{{ ogImage.alt }}"/>
-{% endif %}
+    <meta property="og:title" content="{{ meta.getOgTitle() }}"/>
+    {% set ogImage = meta.getOgImage() %}
+    {% if ogImage %}
+        <meta property="og:image" content="{{ ogImage.url }}"/>
+        <meta property="og:image:width" content="{{ ogImage.width }}"/>
+        <meta property="og:image:height" content="{{ ogImage.height }}"/>
+        <meta property="og:image:alt" content="{{ ogImage.alt }}"/>
+    {% endif %}
     <meta property="og:description" content="{{ meta.getOgDescription() }}"/>
     <meta property="og:site_name" content=""/>
     <meta property="og:locale" content="{{ currentSite.language }}"/>
     {# Twitter #}
     <meta name="twitter:card" content="summary_large_image" />
     <meta name="twitter:site" content="" />
     <meta name="twitter:url" content="{{ craft.app.request.absoluteUrl }}" />
-    <meta name="twitter:title" content="{{ meta.getTwitterTitle(element) }}" />
+    <meta name="twitter:title" content="{{ meta.getTwitterTitle() }}" />
     <meta name="twitter:description" content="{{ meta.getTwitterDescription() }}" />
-{% if ogImage %}
-    <meta name="twitter:image" content="{{ meta.getTwitterImage().url ?? ogImage.url }}" />
-{% endif %}
-    
+    {% if ogImage %}
+        <meta name="twitter:image" content="{{ meta.getTwitterImage().url ?? ogImage.url }}" />
+    {% endif %}
+
     {% if craft.app.response.statusCode < 400 %}
-        <link rel="canonical" href="{{ meta.getCanonical()  }}" />
+        <link rel="canonical" href="{{ meta.getCanonical() }}" />
     {% endif %}
-{% for alt in meta.getAlternate(element) %}
-    <link rel="alternate" hreflang="{{ alt.language }}" href="{{ alt.url }}" />
-{% endfor %}
 
+    {% for alt in meta.getAlternate(element) %}
+        <link rel="alternate" hreflang="{{ alt.language }}" href="{{ alt.url }}" />
+    {% endfor %}
 {% endif %}
 {# SEO Fields meta fields end #}