Merge branch 'group-members-pending' into 'nightly'

[quix0rs-gnu-social.git] / lib / activityhandlerplugin.php

diff --git a/lib/activityhandlerplugin.php b/lib/activityhandlerplugin.php
index c4ff7e3f38770dafd082db592925c6f2909888a2..8b2a458454711187e059d7dc7c39fea4dbf8763d 100644 (file)
--- a/lib/activityhandlerplugin.php
+++ b/lib/activityhandlerplugin.php
@@ -281,10 +281,14 @@ abstract class ActivityHandlerPlugin extends Plugin
      *
      * @return boolean hook value
      */
-    function onNoticeDeleteRelated(Notice $notice)
+    public function onNoticeDeleteRelated(Notice $notice)
     {
         if ($this->isMyNotice($notice)) {
-            $this->deleteRelated($notice);
+            try {
+                $this->deleteRelated($notice);
+            } catch (AlreadyFulfilledException $e) {
+                // Nothing to see here, it's obviously already gone...
+            }
         }
 
         // Always continue this event in our activity handling plugins.
@@ -621,7 +625,11 @@ abstract class ActivityHandlerPlugin extends Plugin
             return true;
         }
 
-        $this->showNoticeContent($stored, $out, $scoped);
+        try {
+            $this->showNoticeContent($stored, $out, $scoped);
+        } catch (Exception $e) {
+            $out->element('div', 'error', $e->getMessage());
+        }
         return false;
     }