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

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

diff --git a/plugins/ActivitySpam/classes/spam_score.php b/plugins/ActivitySpam/classes/spam_score.php
index 2ae32fbfaa4835718ca97b411be479f9ae1978e8..6a2a11d0698895d46a23ced6c58cca58cef3160e 100644 (file)
--- a/plugins/ActivitySpam/classes/spam_score.php
+++ b/plugins/ActivitySpam/classes/spam_score.php
@@ -53,7 +53,7 @@ class Spam_score extends Managed_DataObject
     public $score;       // float
     public $created;     // datetime
 
-    function saveNew($notice, $result) {
+    function saveNew(Notice $notice, $result) {
 
         $score = new Spam_score();
 
@@ -100,11 +100,11 @@ class Spam_score extends Managed_DataObject
         return $score;
     }
 
-    function delete()
+    function delete($useWhere=false)
     {
         self::blow('spam_score:notice_ids');
         self::blow('spam_score:notice_ids;last');
-        parent::delete();
+        return parent::delete($useWhere);
     }
 
     /**