Merge branch '0.8.x' into cmdline

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

diff --git a/classes/Profile_block.php b/classes/Profile_block.php
index 6ea26a3bc46718a8357f33820eac6941d4dd7149..feadea42da8e474ca65b4f805d0fc77b6cab424a 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.
+ * Copyright (C) 2008, 2009, Control Yourself, 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
@@ -36,12 +36,14 @@ 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) {
+    function get($blocker, $blocked)
+    {
         return Memcached_DataObject::pkeyGet('Profile_block',
                                              array('blocker' => $blocker,
                                                    'blocked' => $blocked));