shayarnett (owner)

Revisions

gist: 7572 Download_button fork
public
Public Clone URL: git://gist.github.com/7572.git
Embed All Files: show embed
Diff #
raw 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15

diff --git a/lib/merb-core/controller/mixins/controller.rb b/lib/merb-core/controller/mixi
index 81e5e39..a8ae923 100644
--- a/lib/merb-core/controller/mixins/controller.rb
+++ b/lib/merb-core/controller/mixins/controller.rb
@@ -125,7 +125,7 @@ module Merb
     #   redirect("http://www.merbivore.com/")
     #   redirect("http://www.merbivore.com/", :permanent => true)
     def redirect(url, opts = {})
-      default_redirect_options = { :message => nil, :permanent => false }
+      default_redirect_options = { :message => message.empty? ? nil : message ,:permanent
       opts = default_redirect_options.merge(opts)
       if opts[:message]
         notice = Merb::Request.escape([Marshal.dump(opts[:message])].pack("m"))