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

[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 ac1a572196499f043f224c5a3b39873b72b0381e..11cfe50306ee4d1e4fe1b08ea647735e6b565379 100644 (file)
--- a/app/helpers/open_graph_helper.rb
+++ b/app/helpers/open_graph_helper.rb
@@ -2,11 +2,11 @@ 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_url("osm_logo_256.png", :protocol => "http"),
       "og:image:secure_url" => image_url("osm_logo_256.png", :protocol => "https"),
-      "og:url" => url_for(:host => SERVER_URL),
+      "og:url" => url_for(:only_path => false),
       "og:description" => t("layouts.intro_text")
     }