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

[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 2352ad0b6931993eb488bb5e5e257b869241d7e9..4c88887f920d4462c1650759a3801c4d0ccb4ec5 100644 (file)
--- a/app/views/layouts/_meta.html.erb
+++ b/app/views/layouts/_meta.html.erb
@@ -1,4 +1,3 @@
-<%= favicon_link_tag "favicon.ico" if browser.ie? %>
 <% [57, 60, 72, 76, 114, 120, 144, 152, 180].each do |size| -%>
 <%= favicon_link_tag "apple-touch-icon-#{size}x#{size}.png", :rel => "apple-touch-icon", :sizes => "#{size}x#{size}", :type => "image/png" %>
 <% end -%>
@@ -21,7 +20,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." %>
-<%= opengraph_tags(@title) %>
+<%= opengraph_tags(@title, @opengraph_properties || {}) %>
 <% if flash[:matomo_goal] -%>
 <%= tag.meta :name => "matomo-goal", :content => flash[:matomo_goal] %>
 <% end -%>