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

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

diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb
index 745fb20124aca6400c2eaef4a8bfad3752517900..89ee47f87a35608dc531ea35ea6b8eaa4023f9df 100644 (file)
--- a/app/views/site/_potlatch.html.erb
+++ b/app/views/site/_potlatch.html.erb
@@ -1,10 +1,10 @@
 <%= javascript_include_tag "edit/potlatch" %>
 
 <div id="map">
-  <% session[:token] = current_user.tokens.create.token unless session[:token] && UserToken.find_by_token(session[:token]) -%>
+  <% session[:token] = current_user.tokens.create.token unless session[:token] && UserToken.find_by(:token => session[:token]) -%>
   <% data = { :token => session[:token] } -%>
   <% data[:lat] = @lat if @lat -%>
   <% data[:lon] = @lon if @lon -%>
   <% data[:zoom] = @zoom if @zoom -%>
-  <%= content_tag :div, raw(t("site.edit.flash_player_required")), :id => "potlatch", :data => data %>
+  <%= tag.div t("site.edit.flash_player_required_html"), :id => "potlatch", :data => data %>
 </div>