Mercurial > hg > soundsoftware-site
diff app/models/.svn/text-base/mailer.rb.svn-base @ 246:eeebe205a056 cannam
* Merge from default branch, bringing us up to SVN trunk rev 4993
author | Chris Cannam |
---|---|
date | Thu, 03 Mar 2011 12:02:03 +0000 |
parents | 0579821a129a |
children | cbce1fd3b1b7 |
line wrap: on
line diff
--- a/app/models/.svn/text-base/mailer.rb.svn-base Thu Jan 20 09:59:02 2011 +0000 +++ b/app/models/.svn/text-base/mailer.rb.svn-base Thu Mar 03 12:02:03 2011 +0000 @@ -296,7 +296,7 @@ if raise_errors raise e elsif mylogger - mylogger.error "The following error occured while sending email notification: \"#{e.message}\". Check your configuration in config/email.yml." + mylogger.error "The following error occured while sending email notification: \"#{e.message}\". Check your configuration in config/configuration.yml." end ensure self.class.raise_delivery_errors = raise_errors