aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-08-31 03:16:28 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-08-31 03:16:28 +0000
commit12ff554cd476bd2c653d9fd331bbcabb71363f3a (patch)
treecba0755d5ae3731380370af405e4f7e51490b27c /actionpack/lib/action_view/helpers
parent785e1fa599050513f8d0b235338c771f04dcf422 (diff)
downloadrails-12ff554cd476bd2c653d9fd331bbcabb71363f3a.tar.gz
rails-12ff554cd476bd2c653d9fd331bbcabb71363f3a.tar.bz2
rails-12ff554cd476bd2c653d9fd331bbcabb71363f3a.zip
Tighten rescue clauses. Closes #5985.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4885 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view/helpers')
-rw-r--r--actionpack/lib/action_view/helpers/debug_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/debug_helper.rb b/actionpack/lib/action_view/helpers/debug_helper.rb
index 8baea6f450..9e92813a18 100644
--- a/actionpack/lib/action_view/helpers/debug_helper.rb
+++ b/actionpack/lib/action_view/helpers/debug_helper.rb
@@ -7,7 +7,7 @@ module ActionView
begin
Marshal::dump(object)
"<pre class='debug_dump'>#{h(object.to_yaml).gsub(" ", "&nbsp; ")}</pre>"
- rescue Object => e
+ rescue Exception => e # errors from Marshal or YAML
# Object couldn't be dumped, perhaps because of singleton methods -- this is the fallback
"<code class='debug_dump'>#{h(object.inspect)}</code>"
end