Merge branch 'master' into moderation

[rails.git] / app / views / user / logout.html.erb

diff --git a/app/views/user/logout.html.erb b/app/views/user/logout.html.erb
index bb67d15819fd7bb45a98097d8c219ae85e0f6edb..2620cdaa64ae56deb67cfc40493ebd779a082c17 100644 (file)
--- a/app/views/user/logout.html.erb
+++ b/app/views/user/logout.html.erb
@@ -4,6 +4,6 @@
 
 <%= form_tag :action => "logout" do %>
   <%= hidden_field_tag("referer", h(params[:referer])) %>
-  <%= hidden_field_tag("session", request.session_options[:id]) %>
+  <%= hidden_field_tag("session", session.id) %>
   <%= submit_tag t('user.logout.logout_button') %>
 <% end %>