summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-05-13 11:27:09 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-05-13 11:27:09 +0000
commite62a40a7194703950cf09712f6e6996b25dcda0a (patch)
treed78df16eb050eb9ffa6c257dd6436366a6dba233
parent5a1be1d8df72faa39463ada50c4e10b8abc2ef03 (diff)
downloadredmine-e62a40a7194703950cf09712f6e6996b25dcda0a.tar.gz
redmine-e62a40a7194703950cf09712f6e6996b25dcda0a.zip
Merged r9689 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9690 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/controllers/application_controller.rb11
1 files changed, 0 insertions, 11 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 734b2d81f..2ed4f1521 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -31,17 +31,6 @@ class ApplicationController < ActionController::Base
super
cookies.delete(:autologin)
end
- # Remove broken cookie after upgrade from 0.8.x (#4292)
- # See https://rails.lighthouseapp.com/projects/8994/tickets/3360
- # TODO: remove it when Rails is fixed
- before_filter :delete_broken_cookies
- def delete_broken_cookies
- if cookies['_redmine_session'] && cookies['_redmine_session'] !~ /--/
- cookies.delete '_redmine_session'
- redirect_to home_path
- return false
- end
- end
# FIXME: Remove this when all of Rack and Rails have learned how to
# properly use encodings