Merge branch 'master' into social-master

[quix0rs-gnu-social.git] / classes / Profile_tag_subscription.php

diff --git a/classes/Profile_tag_subscription.php b/classes/Profile_tag_subscription.php
index 28b37940a737a7ed7fba6bd90f3ca1c4ae8025a9..f7b1553300b52010faae091c0fb69916028cd61a 100644 (file)
--- a/classes/Profile_tag_subscription.php
+++ b/classes/Profile_tag_subscription.php
@@ -41,11 +41,6 @@ class Profile_tag_subscription extends Managed_DataObject
         );
     }
 
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Profile_tag_subscription', $kv);
-    }
-
     static function add($peopletag, $profile)
     {
         if ($peopletag->private) {
@@ -132,10 +127,10 @@ class Profile_tag_subscription extends Managed_DataObject
         return $result;
     }
 
-    function delete()
+    function delete($useWhere=false)
     {
-        $result = parent::delete();
-        if ($result) {
+        $result = parent::delete($useWhere);
+        if ($result !== false) {
             self::blow('profile_list:subscriber_count:%d', 
                        $this->profile_tag_id);
         }