Merge branch 'master' into openid
[rails.git] / app / controllers / user_controller.rb
index 4128b61d4a0982cf43ba1b79e7bfe45db3c97d05..9e2961df2716fa95696d1efabf92cf5ec57c04ea 100644 (file)
@@ -286,9 +286,9 @@ class UserController < ApplicationController
         if token
           token.destroy
         end
-        session[:token] = nil
+        session.delete(:token)
       end
-      session[:user] = nil
+      session.delete(:user)
       session_expires_automatically
       if params[:referer]
         redirect_to params[:referer]