From: Evan Prodromou <evan@status.net>
Date: Mon, 18 Jul 2011 14:45:32 +0000 (-0400)
Subject: Merge branch 'testing' into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e274ec4900172b5a53f38e5d9f44d899bf490dc3;p=quix0rs-gnu-social.git

Merge branch 'testing' into 1.0.x
---

e274ec4900172b5a53f38e5d9f44d899bf490dc3
diff --cc classes/Notice.php
index 6eb4d9001e,e82b567e9c..650dca051b
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@@ -84,9 -84,14 +84,14 @@@ class Notice extends Memcached_DataObje
      /* the code above is auto generated do not remove the tag below */
      ###END_AUTOCODE
  
+ 	function multiGet($kc, $kvs, $skipNulls=true)
+ 	{
+ 		return Memcached_DataObject::multiGet('Notice', $kc, $kvs, $skipNulls);
+ 	}
+ 	
      /* Notice types */
      const LOCAL_PUBLIC    =  1;
 -    const REMOTE_OMB      =  0;
 +    const REMOTE          =  0;
      const LOCAL_NONPUBLIC = -1;
      const GATEWAY         = -2;