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

[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..9b44ed4613f38a64345a3e980aa56a0a8dda31c4 100644 (file)
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -1,7 +1,7 @@
 <%= 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[:lat] = @lat if @lat -%>
   <% data[:lon] = @lon if @lon -%>
   <% data[:gpx] = trace_data_url(params[:gpx], :format => :xml) if params[:gpx] -%>