Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / ActivitySpam / ActivitySpamPlugin.php

diff --git a/plugins/ActivitySpam/ActivitySpamPlugin.php b/plugins/ActivitySpam/ActivitySpamPlugin.php
index 627668402345a21ec9b5584e4b01880749713f70..ca31c7ac8e7ea596a7d39fd6c1c3f5db39b704f8 100644 (file)
--- a/plugins/ActivitySpam/ActivitySpamPlugin.php
+++ b/plugins/ActivitySpam/ActivitySpamPlugin.php
@@ -100,7 +100,7 @@ class ActivitySpamPlugin extends Plugin
      * @return boolean hook value; true means continue processing, false means stop.
      */
 
-    function onEndNoticeSave($notice)
+    function onEndNoticeSave(Notice $notice)
     {
         try {
 
@@ -142,8 +142,11 @@ class ActivitySpamPlugin extends Plugin
         return false;
     }
 
-    function onEndShowNoticeOptionItems(NoticeListItem $nli)
+    function onEndShowNoticeOptionItems($nli)
     {
+        // FIXME: Cannot use type-hint NoticeListItem as NoticeListItemAdapter exists, too!
+        assert(is_object($nli));
+
         $profile = Profile::current();
 
         if (!empty($profile) && $profile->hasRight(self::TRAINSPAM)) {