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

[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 cb72d7254cdf7c7db7aced287179b980fba23094..99b8d00a3f95dc97d7b66d40bb10facd1e9e690c 100644 (file)
--- a/app/helpers/open_graph_helper.rb
+++ b/app/helpers/open_graph_helper.rb
@@ -2,15 +2,16 @@ module OpenGraphHelper
   def opengraph_tags(title = nil)
     tags = {
       "og:site_name" => t("layouts.project_name.title"),
-      "og:title" => [t("layouts.project_name.title"), title].compact.join(" | "),
+      "og:title" => [title, t("layouts.project_name.title")].compact.join(" | "),
       "og:type" => "website",
-      "og:image" => image_path("osm_logo_256.png", :host => SERVER_URL, :protocol => "http"),
-      "og:image:secure_url" => image_path("osm_logo_256.png", :host => SERVER_URL, :protocol => "https"),
-      "og:url" => url_for(:host => SERVER_URL)
+      "og:image" => image_url("osm_logo_256.png", :protocol => "http"),
+      "og:image:secure_url" => image_url("osm_logo_256.png", :protocol => "https"),
+      "og:url" => url_for(:only_path => false),
+      "og:description" => t("layouts.intro_text")
     }
 
-    tags.map do |property, content|
+    safe_join(tags.map do |property, content|
       tag(:meta, :property => property, :content => content)
-    end.join("").html_safe
+    end, "\n")
   end
 end