From: Tom Hughes <tom@compton.nu>
Date: Wed, 1 Jun 2011 09:16:11 +0000 (+0100)
Subject: Force a session to be created when doing a cookie test
X-Git-Tag: live~6262^2~5
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d681d7e07f24aead8f160c14d6fded173b4fcc2a?hp=4d64b178b8968421ff30e188a2105e7560efc7f0

Force a session to be created when doing a cookie test
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6c19b3a52..122349aff 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -61,11 +61,14 @@ class ApplicationController < ActionController::Base
   def require_cookies
     if request.cookies["_osm_session"].to_s == ""
       if params[:cookie_test].nil?
+        session[:cookie_test] = true
         redirect_to params.merge(:cookie_test => "true")
         return false
       else
         flash.now[:warning] = t 'application.require_cookies.cookies_needed'
       end
+    else
+      session.delete(:cookie_test)
     end
   end