Merge branch 'master' into openstreetbugs

[rails.git] / app / controllers / user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index fcf6526eb0eb1db8c91f6c4a0dd7ea2706679585..97b0de73c79fdf4d85676069df17a816a6989fd3 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -522,6 +522,6 @@ private
     # this is necessary otherwise going to the user terms page, when 
     # having not agreed already would cause an infinite redirect loop.
     # it's .now so that this doesn't propagate to other pages.
     # this is necessary otherwise going to the user terms page, when 
     # having not agreed already would cause an infinite redirect loop.
     # it's .now so that this doesn't propagate to other pages.

-    flash.now[:showing_terms] = true
+    flash.now[:skip_terms] = true

   end
 end
   end
 end