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

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

diff --git a/classes/Group_block.php b/classes/Group_block.php
index a3a232c80de459ee32199bf5ad45ffc9c99ff751..2cf46aa61d28aa7997571d0c08b5b61d69006216 100644 (file)
--- a/classes/Group_block.php
+++ b/classes/Group_block.php
@@ -55,11 +55,6 @@ class Group_block extends Managed_DataObject
         );
     }
 
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Group_block', $kv);
-    }
-
     static function isBlocked($group, $profile)
     {
         $block = Group_block::pkeyGet(array('group_id' => $group->id,
@@ -81,7 +76,7 @@ class Group_block extends Managed_DataObject
 
         $result = $block->insert();
 
-        if (!$result) {
+        if ($result === false) {
             common_log_db_error($block, 'INSERT', __FILE__);
             return null;
         }
@@ -95,7 +90,7 @@ class Group_block extends Managed_DataObject
 
         if ($member->find(true)) {
             $result = $member->delete();
-            if (!$result) {
+            if ($result === false) {
                 common_log_db_error($member, 'DELETE', __FILE__);
                 return null;
             }