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

[rails.git] / app / views / site / _id.html.erb

diff --git a/app/views/site/_id.html.erb b/app/views/site/_id.html.erb
index 867b148fd4aeba0ea4b1ba5a47945d33a0e6a238..f1f48c1e10687f71f600f9f5235ff9aff8f1332a 100644 (file)
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -1,10 +1,10 @@
 <%= javascript_include_tag "edit/id" %>
 
 <div id="map">
 <%= javascript_include_tag "edit/id" %>
 
 <div id="map">

-  <% data = { :key => ID_KEY } -%>
+  <% data = { :key => Settings.id_key } -%>

   <% data[:lat] = @lat if @lat -%>
   <% data[:lon] = @lon if @lon -%>
   <% data[:gpx] = trace_data_url(params[:gpx], :format => :xml) if params[:gpx] -%>
   <% data[:url] = id_url(:locale => params[:locale]) -%>
   <% data[:lat] = @lat if @lat -%>
   <% data[:lon] = @lon if @lon -%>
   <% data[:gpx] = trace_data_url(params[:gpx], :format => :xml) if params[:gpx] -%>
   <% data[:url] = id_url(:locale => params[:locale]) -%>

-  <%= content_tag :iframe, "", :frameBorder => 0, :id => "id-embed", :class => "id-embed", :allowfullscreen => "", :data => data %>
+  <%= tag.iframe "", :frameBorder => 0, :id => "id-embed", :class => "id-embed", :allowfullscreen => "", :data => data %>

 </div>
 </div>