Merge remote-tracking branch 'upstream/pull/1788'

[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 e6d0dec597ba1ff9eff6595ac98e1db9684921ce..2620cdaa64ae56deb67cfc40493ebd779a082c17 100644 (file)
--- a/app/views/user/logout.html.erb
+++ b/app/views/user/logout.html.erb
@@ -1,6 +1,9 @@
-<h1><%= t 'user.logout.heading' %></h1>
-<% form_tag :action => "logout" do %>
+<% content_for :heading do %>
+  <h1><%= t 'user.logout.heading' %></h1>
+<% end %>
+
+<%= 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 %>