Mercurial > hg > soundsoftware-site
comparison app/models/.svn/text-base/mailer.rb.svn-base @ 210:0579821a129a
Update to Redmine trunk rev 4802
author | Chris Cannam |
---|---|
date | Tue, 08 Feb 2011 13:51:46 +0000 |
parents | 94944d00e43c |
children | cbce1fd3b1b7 |
comparison
equal
deleted
inserted
replaced
128:07fa8a8b56a8 | 210:0579821a129a |
---|---|
294 return super(mail) | 294 return super(mail) |
295 rescue Exception => e | 295 rescue Exception => e |
296 if raise_errors | 296 if raise_errors |
297 raise e | 297 raise e |
298 elsif mylogger | 298 elsif mylogger |
299 mylogger.error "The following error occured while sending email notification: \"#{e.message}\". Check your configuration in config/email.yml." | 299 mylogger.error "The following error occured while sending email notification: \"#{e.message}\". Check your configuration in config/configuration.yml." |
300 end | 300 end |
301 ensure | 301 ensure |
302 self.class.raise_delivery_errors = raise_errors | 302 self.class.raise_delivery_errors = raise_errors |
303 end | 303 end |
304 end | 304 end |