Created
August 27, 2008 20:17
-
-
Save shayarnett/7572 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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")) | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment