Merge pull request #66 from dgsiegel/void-meta-tags

Void meta tags don't require a closing slash anymore
vaersaagod · Jan 19, 2024 · 109bd2d · 109bd2d
2 parents a324381 + d4dd091
commit 109bd2d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/models/Settings.php b/src/models/Settings.php
@@ -113,7 +113,7 @@ class Settings extends Model
     ];
 
     public array $tagTemplateMap = [
-        'default' => '<meta name="{{ key }}" content="{{ value }}"/>',
+        'default' => '<meta name="{{ key }}" content="{{ value }}">',
         'title' => '<title>{{ value }}</title>',
         '/^og:/,/^fb:/' => '<meta property="{{ key }}" content="{{ value }}">',
     ];

diff --git a/src/templates/_output/meta.twig b/src/templates/_output/meta.twig
@@ -1,10 +1,10 @@
 {% set meta = seomate.meta %}
-<link rel="home" href="{{ siteUrl() }}"/>
+<link rel="home" href="{{ siteUrl() }}">
 {% if craft.app.getResponse().getStatusCode() < 400 %}
 <link rel="canonical" href="{{ seomate.canonicalUrl }}">
-{% if meta['og:url'] is not defined %}<meta property="og:url" content="{{ seomate.canonicalUrl }}"/>{% endif %}
-{% if meta['twitter:url'] is not defined %}<meta name="twitter:url" content="{{ seomate.canonicalUrl }}"/>{% endif %}
-{% if meta['og:locale'] is not defined %}<meta property="og:locale" content="{{ craft.app.getSites().getCurrentSite().language }}"/>{% endif %}
+{% if meta['og:url'] is not defined %}<meta property="og:url" content="{{ seomate.canonicalUrl }}">{% endif %}
+{% if meta['twitter:url'] is not defined %}<meta name="twitter:url" content="{{ seomate.canonicalUrl }}">{% endif %}
+{% if meta['og:locale'] is not defined %}<meta property="og:locale" content="{{ craft.app.getSites().getCurrentSite().language }}">{% endif %}
 {% endif %}
 
 {% for key, data in meta %}
@@ -16,6 +16,6 @@
 {% set alternateUrls = seomate.alternateUrls ?? null %}
 {% if alternateUrls %}
     {% for alternateUrl in alternateUrls -%}
-        <link rel="alternate" href="{{ alternateUrl.url }}" hreflang="{{ alternateUrl.language }}"/>
+        <link rel="alternate" href="{{ alternateUrl.url }}" hreflang="{{ alternateUrl.language }}">
     {% endfor %}
 {% endif %}