From: Evan Prodromou <evan@status.net>
Date: Sun, 3 Jan 2010 05:47:34 +0000 (-1000)
Subject: Merge branch 'master' into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=90a2563a90e1bf2239d177a564bbe3e838d93dc4;p=quix0rs-gnu-social.git

Merge branch 'master' into 0.9.x

Conflicts:
	classes/Memcached_DataObject.php
---

90a2563a90e1bf2239d177a564bbe3e838d93dc4
diff --cc classes/Memcached_DataObject.php
index 4f81bef75c,b43cb0b56f..1608720d14
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@@ -23,29 -23,6 +23,29 @@@ require_once INSTALLDIR.'/classes/Memca
  
  class Memcached_DataObject extends DB_DataObject
  {
-     /**
++   /**
 +     * Destructor to free global memory resources associated with
 +     * this data object when it's unset or goes out of scope.
 +     * DB_DataObject doesn't do this yet by itself.
 +     */
 +
 +    function __destruct()
 +    {
 +        $this->free();
 +        if (method_exists('DB_DataObject', '__destruct')) {
 +            parent::__destruct();
 +        }
 +    }
 +
 +    /**
 +     * Wrapper for DB_DataObject's static lookup using memcached
 +     * as backing instead of an in-process cache array.
 +     *
 +     * @param string $cls classname of object type to load
 +     * @param mixed $k key field name, or value for primary key
 +     * @param mixed $v key field value, or leave out for primary key lookup
 +     * @return mixed Memcached_DataObject subtype or false
 +     */
      function &staticGet($cls, $k, $v=null)
      {
          if (is_null($v)) {