summaryrefslogtreecommitdiff
path: root/scripts/maildaemon.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-09-29 17:25:52 -0400
committerEvan Prodromou <evan@status.net>2009-09-29 17:25:52 -0400
commit89ac81c34464b2fc4f54b643d0d95d12bac765ab (patch)
tree4e3277cb5ad9d93a61262f004a82efc14eaf7d30 /scripts/maildaemon.php
parent0a57d1ccee1af8570d4c83934d9ab99fa1a1dc37 (diff)
remove string-checks from code using Notice::saveNew()
Diffstat (limited to 'scripts/maildaemon.php')
-rwxr-xr-xscripts/maildaemon.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/maildaemon.php b/scripts/maildaemon.php
index 5705cfd50..586bef624 100755
--- a/scripts/maildaemon.php
+++ b/scripts/maildaemon.php
@@ -260,10 +260,11 @@ class MailerDaemon
function add_notice($user, $msg, $fileRecords)
{
- $notice = Notice::saveNew($user->id, $msg, 'mail');
- if (is_string($notice)) {
- $this->log(LOG_ERR, $notice);
- return $notice;
+ try {
+ $notice = Notice::saveNew($user->id, $msg, 'mail');
+ } catch (Exception $e) {
+ $this->log(LOG_ERR, $e->getMessage());
+ return $e->getMessage();
}
foreach($fileRecords as $fileRecord){
$this->attachFile($notice, $fileRecord);