Merge remote-tracking branch 'upstream/nightly' into nightly

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

diff --git a/lib/activityhandlerplugin.php b/lib/activityhandlerplugin.php
index b0931987033421f9f40256de5518face8e2b1b38..c06f723a3686f2ca3546bdbdb50e47429c7b4f72 100644 (file)
--- a/lib/activityhandlerplugin.php
+++ b/lib/activityhandlerplugin.php
@@ -108,6 +108,7 @@ abstract class ActivityHandlerPlugin extends Plugin
     }
 
     function isMyType($type) {
+        // Third argument to compareTypes is true, to allow for notices with empty object_type for example (verb-only)
         return count($this->types())===0 || ActivityUtils::compareTypes($type, $this->types());
     }
 
@@ -278,6 +279,10 @@ abstract class ActivityHandlerPlugin extends Plugin
         if ($this->isMyNotice($notice)) {
             try {
                 $this->deleteRelated($notice);
+            } catch (NoProfileException $e) {
+                // we failed because of database lookup failure, Notice has no recognized profile as creator
+                // so we skip this. If we want to remove missing notices we should do a SQL constraints check
+                // in the affected plugin.
             } catch (AlreadyFulfilledException $e) {
                 // Nothing to see here, it's obviously already gone...
             }