Merge branch '0.9.x' into testing

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

diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 8fdb56088b94642a16108e802dac25b34882ae65..70e9e351d5e8855f814d168b2505091f8b427bf1 100644 (file)
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -28,10 +28,13 @@ class Memcached_DataObject extends DB_DataObject
      * 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();
-        parent::__destruct();
+        if (method_exists('DB_DataObject', '__destruct')) {
+            parent::__destruct();
+        }
     }
 
     function &staticGet($cls, $k, $v=null)