Merge remote-tracking branch 'upstream/pull/5135'

[rails.git] / app / helpers / open_graph_helper.rb

diff --git a/app/helpers/open_graph_helper.rb b/app/helpers/open_graph_helper.rb
index dbd20446295d76a556d10a28481e26eb40a7e039..cde848e5d13762ac718431632aaf44c597c3bf54 100644 (file)
--- a/app/helpers/open_graph_helper.rb
+++ b/app/helpers/open_graph_helper.rb
@@ -7,9 +7,11 @@ module OpenGraphHelper
       "og:title" => title || t("layouts.project_name.title"),
       "og:type" => "website",
       "og:url" => url_for(:only_path => false),
       "og:title" => title || t("layouts.project_name.title"),
       "og:type" => "website",
       "og:url" => url_for(:only_path => false),

-      "og:description" => t("layouts.intro_text")
+      "og:description" => properties["og:description"] || t("layouts.intro_text")

     }.merge(
       opengraph_image_properties(properties)
     }.merge(
       opengraph_image_properties(properties)

+    ).merge(
+      properties.slice("article:published_time")

     )
 
     safe_join(tags.map do |property, content|
     )
 
     safe_join(tags.map do |property, content|