Merge pull request #46 from Dave-Clark-Design-Associates/dcda_main

Bugfix: Fall back Default image wasn't being loaded.
Cyber-Duck · Aug 30, 2022 · 0b7c401 · 0b7c401
2 parents e11c9b5 + 918650e
commit 0b7c401
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 todo
 
-.sass-cache
+.sass-cache
+.idea
+.vscode/settings.json
diff --git a/src/Model/Extension/SeoPageControllerExtension.php b/src/Model/Extension/SeoPageControllerExtension.php
@@ -69,12 +69,17 @@ public function getPageMetaTags()
         return DBField::create_field('HTMLText', $meta);
     }
 
+    /**
+     * Gets the Defaut Page Social Image, this is defined in the CMS
+     * 
+     * @return null|Image
+     */
     public function getDefaultPageSocialImage()
     {
         $siteConfig = SiteConfig::get()->first();
 
         if ($siteConfig) {
-            $image =  Image::get()->byID($siteConfig->DefaultPageSocialImageID);
+            $image =  Image::get()->byID($siteConfig->DefaultSocialImageID);
 
             if ($image) {
                 return $image;

diff --git a/templates/HeadTags.ss b/templates/HeadTags.ss
@@ -24,6 +24,7 @@
             <meta name="twitter:image" content="$PageSocialImage.AbsoluteURL">
         <% else_if $DefaultPageSocialImage %>
             <meta property="og:image" content="$DefaultPageSocialImage.AbsoluteURL">
+            <meta name="twitter:image" content="$DefaultPageSocialImage.AbsoluteURL">
         <% end_if %>
 
         <% if $SiteFacebookAppID %>