Merge branch 'master' into 0.9.x

2010-09-21 12:48:16 -07:00
parent d342899677 1bc45e191d
commit 42dd460d3b
15 changed files with 384 additions and 20 deletions
--- a/plugins/SubMirror/lib/mirrorqueuehandler.php
+++ b/plugins/SubMirror/lib/mirrorqueuehandler.php
@@ -36,7 +36,13 @@ class MirrorQueueHandler extends QueueHandler
        $mirror->subscribed = $notice->profile_id;
        if ($mirror->find()) {
            while ($mirror->fetch()) {
-                $mirror->mirrorNotice($notice);
+                try {
+                    $mirror->mirrorNotice($notice);
+                } catch (Exception $e) {
+                    common_log(LOG_ERR, "Exception trying to mirror notice $notice->id " .
+                                        "for subscriber $mirror->subscriber ($mirror->style): " .
+                                        $e->getMessage());
+                }
            }
        }
        return true;