summaryrefslogtreecommitdiff
path: root/classes/Memcached_DataObject.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-01-04 22:50:04 -1000
committerEvan Prodromou <evan@status.net>2010-01-04 22:50:04 -1000
commit4e84c523b7911b8b6cb6113b9c91cbfdc47f027d (patch)
tree7cf668ac187923557b955b0a46428056fe0ad1fa /classes/Memcached_DataObject.php
parent0c31c3d80c379c3db1c063e3caba0d450bb83ab7 (diff)
parent2960193cc4f9be74713896ddb0e7debb1190c163 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts: classes/Memcached_DataObject.php
Diffstat (limited to 'classes/Memcached_DataObject.php')
-rw-r--r--classes/Memcached_DataObject.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index a3a69e667..aab1cace6 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -66,7 +66,6 @@ class Memcached_DataObject extends DB_DataObject
// Clear this out so we don't accidentally break global
// state in *this* process.
$this->_DB_resultid = null;
-
// We don't have any local DBO refs, so clear these out.
$this->_link_loaded = false;
}