summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@status.net>2010-01-04 14:37:39 -0800
committerBrion Vibber <brion@status.net>2010-01-04 14:37:39 -0800
commit8f02379f6e05e4bf1bff69d6d0fcf3d90a4d1181 (patch)
treef24fac33191d22584f01d8695d05b7294a1fadca
parentaf95005bc481d6f8f84a780bdc062426e22f3a03 (diff)
Revert "Take Memcached_DataObject destructor back out to check whether it might be causing some under-the-hood problems."
This reverts commit 89cca01259d71f3da961ef64def3647f86a01567.
-rw-r--r--classes/Memcached_DataObject.php14
1 files changed, 14 insertions, 0 deletions
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index b43cb0b56..d89a9421e 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -23,6 +23,20 @@ require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
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();
+ }
+ }
+
function &staticGet($cls, $k, $v=null)
{
if (is_null($v)) {