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 ffc57a496e0266c1a6d104f4edc4e930c42bfe40..2cf46aa61d28aa7997571d0c08b5b61d69006216 100644 (file)
--- a/classes/Group_block.php
+++ b/classes/Group_block.php
@@ -23,7 +23,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Group_block extends Memcached_DataObject
+class Group_block extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -34,15 +34,25 @@ class Group_block extends Memcached_DataObject
     public $blocker;                         // int(4)   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Group_block',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function pkeyGet($kv)
+    public static function schemaDef()
     {
-        return Memcached_DataObject::pkeyGet('Group_block', $kv);
+        return array(
+            'fields' => array(
+                'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group profile is blocked from'),
+                'blocked' => array('type' => 'int', 'not null' => true, 'description' => 'profile that is blocked'),
+                'blocker' => array('type' => 'int', 'not null' => true, 'description' => 'user making the block'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date of blocking'),
+            ),
+            'primary key' => array('group_id', 'blocked'),
+            'foreign keys' => array(
+                'group_block_group_id_fkey' => array('user_group', array('group_id' => 'id')),
+                'group_block_blocked_fkey' => array('profile', array('blocked' => 'id')),
+                'group_block_blocker_fkey' => array('user', array('blocker' => 'id')),
+            ),
+        );
     }
 
     static function isBlocked($group, $profile)
@@ -66,7 +76,7 @@ class Group_block extends Memcached_DataObject
 
         $result = $block->insert();
 
-        if (!$result) {
+        if ($result === false) {
             common_log_db_error($block, 'INSERT', __FILE__);
             return null;
         }
@@ -80,7 +90,7 @@ class Group_block extends Memcached_DataObject
 
         if ($member->find(true)) {
             $result = $member->delete();
-            if (!$result) {
+            if ($result === false) {
                 common_log_db_error($member, 'DELETE', __FILE__);
                 return null;
             }