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

[rails.git] / app / views / layouts / _meta.html.erb

diff --git a/app/views/layouts/_meta.html.erb b/app/views/layouts/_meta.html.erb
index 37afbb89498e5cc67a2e101a17c4e83d312bc62f..790d13fc380b03161f8ee59c0ed679559a68b31d 100644 (file)
--- a/app/views/layouts/_meta.html.erb
+++ b/app/views/layouts/_meta.html.erb
@@ -21,7 +21,7 @@
 <% end -%>
 <%= tag.link :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => asset_path("osm.xml") %>
 <%= tag.meta :name => "description", :content => "OpenStreetMap is the free wiki world map." %>
 <% end -%>
 <%= tag.link :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => asset_path("osm.xml") %>
 <%= tag.meta :name => "description", :content => "OpenStreetMap is the free wiki world map." %>

-<%= opengraph_tags(@title, @og_image) %>
+<%= opengraph_tags(@title, @opengraph_properties || {}) %>

 <% if flash[:matomo_goal] -%>
 <%= tag.meta :name => "matomo-goal", :content => flash[:matomo_goal] %>
 <% end -%>
 <% if flash[:matomo_goal] -%>
 <%= tag.meta :name => "matomo-goal", :content => flash[:matomo_goal] %>
 <% end -%>