aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-03-28 21:23:28 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2008-03-28 21:23:28 +0000
commit18049864cbe4bbdfd7eb0e96238877bfe74d79fd (patch)
treeea6877f0af813acdb2e0a076e3a7848eea373e83 /actionpack/lib/action_controller/base.rb
parentc00de99f69358b58ca2bd6bc732e2de1b667800e (diff)
downloadrails-18049864cbe4bbdfd7eb0e96238877bfe74d79fd.tar.gz
rails-18049864cbe4bbdfd7eb0e96238877bfe74d79fd.tar.bz2
rails-18049864cbe4bbdfd7eb0e96238877bfe74d79fd.zip
Inspect options hashes in RenderError message so it's actually readable. Closes #11435 [court3nay]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9123 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
-rwxr-xr-xactionpack/lib/action_controller/base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 4b6411df30..d7e4116581 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -836,12 +836,12 @@ module ActionController #:nodoc:
if options.nil?
return render_for_file(default_template_name, nil, true)
elsif !extra_options.is_a?(Hash)
- raise RenderError, "You called render with invalid options : #{options}, #{extra_options}"
+ raise RenderError, "You called render with invalid options : #{options.inspect}, #{extra_options.inspect}"
else
if options == :update
options = extra_options.merge({ :update => true })
elsif !options.is_a?(Hash)
- raise RenderError, "You called render with invalid options : #{options}"
+ raise RenderError, "You called render with invalid options : #{options.inspect}"
end
end