Use distance_in_words_ago scope for user blocks

[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 b0d20a9ae134ea9b4ebdd4ec64b6764571fcc4fc..3ebcf7fabf1100233d6614a266b77094fb092be2 100644 (file)
--- a/app/views/site/_potlatch.html.erb
+++ b/app/views/site/_potlatch.html.erb
@@ -1,7 +1,7 @@
 <%= javascript_include_tag "edit/potlatch" %>
 
 <div id="map">
-  <% session[:token] = @user.tokens.create.token unless session[:token] and 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 -%>