diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-08-31 03:16:28 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-08-31 03:16:28 +0000 |
| commit | 12ff554cd476bd2c653d9fd331bbcabb71363f3a (patch) | |
| tree | cba0755d5ae3731380370af405e4f7e51490b27c /actionmailer | |
| parent | 785e1fa599050513f8d0b235338c771f04dcf422 (diff) | |
| download | rails-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 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index 267a6265f5..53830283f8 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Tighten rescue clauses. #5985 [james@grayproductions.net] + * Automatically included ActionController::UrlWriter, such that URL generation can happen within ActionMailer controllers. [DHH] * Replace Reloadable with Reloadable::Deprecated. [Nicholas Seckar] diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 6143121519..7045fddb1b 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -396,7 +396,7 @@ module ActionMailer #:nodoc: begin send("perform_delivery_#{delivery_method}", mail) if perform_deliveries - rescue Object => e + rescue Exception => e # Net::SMTP errors or sendmail pipe errors raise e if raise_delivery_errors end |