From: Tom Hughes <tom@compton.nu>
Date: Wed, 1 Jun 2011 09:17:54 +0000 (+0100)
Subject: Use session.delete to remove entries instead of assigning nil
X-Git-Tag: live~6285^2~4
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c4f7a8346a7e42643cc7ba5c114b6f2be43aff80?hp=d681d7e07f24aead8f160c14d6fded173b4fcc2a

Use session.delete to remove entries instead of assigning nil
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 122349aff..1d3297d16 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -11,7 +11,7 @@ class ApplicationController < ActionController::Base
       @user = User.find(session[:user], :conditions => {:status => ["active", "confirmed", "suspended"]})
 
       if @user.status == "suspended"
-        session[:user] = nil
+        session.delete(:user)
         session_expires_automatically
 
         redirect_to :controller => "user", :action => "suspended"
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 97b0de73c..283e11936 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -272,9 +272,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]