From 0f12e2a360c2492f2298dbf92d473ca291605262 Mon Sep 17 00:00:00 2001
From: francis <francis>
Date: Thu, 12 Jun 2008 14:10:46 +0000
Subject: Actually give a message if cookies are disabled.

---
 app/controllers/user_controller.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'app/controllers/user_controller.rb')

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index af2f572ba..668dec2a0 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -4,7 +4,7 @@
 # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: user_controller.rb,v 1.47 2008-06-12 13:43:29 francis Exp $
+# $Id: user_controller.rb,v 1.48 2008-06-12 14:10:46 francis Exp $
 
 class UserController < ApplicationController
     # Show page about a set of users with same url name
@@ -30,6 +30,13 @@ class UserController < ApplicationController
     def signin
         work_out_post_redirect
 
+        if session.instance_variable_get(:@dbman)
+            if not session.instance_variable_get(:@dbman).instance_variable_get(:@original)
+                render :action => 'no_cookies'
+                return
+            end
+        end
+        
         if not params[:user_signin] 
             # First time page is shown
             render :action => 'sign' 
-- 
cgit v1.2.3