Permalink
Browse files

Applied a patch, thanks cilquirm.

  • Loading branch information...
1 parent 0efb51a commit a16a05c546fa7a4347fbe6a82e495f467edeb585 @wayneeseguin wayneeseguin committed Aug 13, 2008
Showing with 4 additions and 3 deletions.
  1. +4 −3 lib/merb-auth/controller/controller.rb
@@ -81,10 +81,11 @@ def store_location
# Redirect to the URI stored by the most recent store_location call or
# to the passed default.
- def redirect_back_or_default(default,message = "")
- loc = session[:return_to] || default
+ def redirect_back_or_default(default, notice = "")
+ url = session[:return_to] || default
session[:return_to] = nil
- redirect loc, message
+ message[:notice] = notice
+ redirect url, message
end
# Called from #current_ma_user. First attempt to login by the user id stored in the session.

0 comments on commit a16a05c

Please sign in to comment.