[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/1.1.3-1-64-g6714516

[Jérémy Lal]

The following commit has been merged in the master-experimental branch:
commit 6fae4ae53af6d0f977e9a0f3e9cefaaadcc6accd
Author: Jérémy Lal <kapouer at melix.org>
Date:   Wed Aug 24 21:54:25 2011 +0200

    Patch to fix cookies.delete "symbol is not a string" issue. (#637486)
    
    Conflicts:
    
    	debian/patches/series

diff --git a/debian/patches/1014_logout_cookie_rake.patch b/debian/patches/1014_logout_cookie_rake.patch
new file mode 100644
index 0000000..a118c84
--- /dev/null
+++ b/debian/patches/1014_logout_cookie_rake.patch
@@ -0,0 +1,15 @@
+Description: Cookie values need to be strings in some rails/rake versions.
+Bug-Redmine: http://www.redmine.org/issues/9118
+Author: Eduardo Rocha <folhabranca at gmail.com>
+Last-Update: 2011-08-14
+--- a/app/controllers/account_controller.rb.orig	2011-08-24 11:41:33.000000000 -0300
++++ b/app/controllers/account_controller.rb	2011-08-24 09:21:00.000000000 -0300
+@@ -129,7 +129,7 @@
+   
+   def logout_user
+     if User.current.logged?
+-      cookies.delete :autologin
++      cookies.delete :autologin.to_s
+       Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin'])
+       self.logged_user = nil
+     end
diff --git a/debian/patches/series b/debian/patches/series
index d9a35a4..d7d38ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 1013_indent_subject_exported_pdf.patch
 2014_relax_RAILS_GEM_VERSION.patch
 2015_use_system_coderay.patch
+1014_logout_cookie_rake.patch

-- 
redmine.git