Use rails 5 version of redirect_back.

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

diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 8d90ad7ccb28c3fc4a226aad29f717ae69d020e0..377d55e9dedf821501c396855e70e0162d55261c 100644 (file)
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -24,8 +24,10 @@
   <%= tag("meta", { :name => "msapplication-TileColor", :content => "#00a300" }) %>
   <%= tag("meta", { :name => "msapplication-TileImage", :content => image_path("mstile-144x144.png") }) %>
   <%= tag("meta", { :name => "theme-color", :content => "#ffffff" }) %>
-  <%= tag("link", { :rel => "canonical", :href => root_url(:host => SERVER_URL) }) %>
-  <%= tag("link", { :rel => "publisher", :href => "https://plus.google.com/111953119785824514010" }) %>
+  <%= canonical_tag %>
+  <% if defined?(PUBLISHER_URL) -%>
+  <%= tag("link", { :rel => "publisher", :href => PUBLISHER_URL }) %>
+  <% 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) %>