X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/83beee6d6a49c7403ac21e0603b923905f56d527..048f7fca8c985a8c9c138d8fc0041db5231b0fc0:/app/views/layouts/site.rhtml?ds=sidebyside

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 8d2ac722e..f42048b88 100644
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -26,9 +26,9 @@
     <span id="greeting">
       <% if @user %>
         Welcome, <%= link_to @user.display_name, {:controller => 'user', :action => 'view', :display_name => @user.display_name}, {:id => 'loginanchor'}%> |
-        <%= link_to 'logout', {:controller => 'user', :action => 'logout'}, {:id => 'loginanchor'}%>
+        <%= link_to 'logout', {:controller => 'user', :action => 'logout', :next_controller => @controller.controller_name, :next_action => @controller.action_name}, {:id => 'loginanchor'}%>
       <% else %>
-        <%= link_to 'log in', {:controller => 'user', :action => 'login'}, {:id => 'loginanchor'}%> |
+        <%= link_to 'log in', {:controller => 'user', :action => 'login', :next_controller => @controller.controller_name, :next_action => @controller.action_name}, {:id => 'loginanchor'}%> |
         <%= link_to 'sign up', {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %>
       <% end %>
     </span>