From ccbd99f88bf8dfc58988078cd0ee44ee3d40cc3d Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Fri, 24 Nov 2017 14:13:45 +0100
Subject: [PATCH] improves social media meta tags partial with settings

---
 app/views/shared/_social_media_meta_tags.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/shared/_social_media_meta_tags.html.erb b/app/views/shared/_social_media_meta_tags.html.erb
index d4d8a42b8..8782aad17 100644
--- a/app/views/shared/_social_media_meta_tags.html.erb
+++ b/app/views/shared/_social_media_meta_tags.html.erb
@@ -1,11 +1,11 @@
 <!-- Twitter -->
 <meta name="twitter:card" content="summary" />
 <meta name="twitter:site" content="@consul_dev" />
-<meta name="twitter:title" content="<%= social_title %>" />
-<meta name="twitter:description" content="<%= social_description %>" />
+<meta name="twitter:title" content="<%= local_assigns[:social_title] || setting['meta_title'] %>" />
+<meta name="twitter:description" content="<%= local_assigns[:social_description] || setting['meta_description'] %>" />
 <meta name="twitter:image" content="<%=  root_url + (local_assigns[:twitter_image_url] || 'social_media_icon_twitter.png')%>" />
 <!-- Facebook OG -->
-<meta id="ogtitle" property="og:title" content="<%= social_title %>"/>
+<meta id="ogtitle" property="og:title" content="<%= local_assigns[:social_title] || setting['meta_title'] %>"/>
 <% if setting['url'] %>
   <meta property="article:publisher" content=<%= setting['url'] %>/>
 <% end %>
@@ -16,5 +16,5 @@
 <meta id="ogurl" property="og:url" content="<%= social_url %>"/>
 <meta id="ogimage" property="og:image" content="<%= root_url + (local_assigns[:og_image_url] || 'social_media_icon.png') %>"/>
 <meta property="og:site_name" content="<%= setting['org_name'] %>"/>
-<meta id="ogdescription" property="og:description" content="<%= social_description %>"/>
+<meta id="ogdescription" property="og:description" content="<%= local_assigns[:social_description] || setting['meta_description'] %>"/>
 <meta property="fb:app_id" content="<%= Rails.application.secrets.facebook_key %>"/>