Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing

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

diff --git a/classes/Profile_block.php b/classes/Profile_block.php
index 47f763386a06f4a36a91f926a30adff4604c8421..2d87edaa0af84cfb4058ee47448a76727a228e66 100644 (file)
--- a/classes/Profile_block.php
+++ b/classes/Profile_block.php
@@ -1,7 +1,7 @@
 <?php
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 /**
  * Table Definition for profile_block
@@ -36,13 +36,16 @@ class Profile_block extends Memcached_DataObject
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Profile_block',$k,$v); }
+    function staticGet($k,$v=null)
+    { return Memcached_DataObject::staticGet('Profile_block',$k,$v); }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function get($blocker, $blocked) {
-               return Profile_block::pkeyGet(array('blocker' => $blocker,
-                                            'blocked' => $blocked));
-    }
+    function get($blocker, $blocked)
+    {
+        return Memcached_DataObject::pkeyGet('Profile_block',
+                                             array('blocker' => $blocker,
+                                                   'blocked' => $blocked));
+     }
 }