summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-01-03 11:24:05 -1000
committerEvan Prodromou <evan@status.net>2010-01-03 11:24:05 -1000
commitd5fb88e1c0a617423a6fd9f9a23141c36245f38c (patch)
treea3a2a5a543e314fb9393f682af56f4b8a4301cb8
parente9407902412e060cc88176acf108a446d3cd66d4 (diff)
Revert "use keys() instead of keyTypes() so plugin data object work"
This reverts commit ec380887f71a1eadc75bad0289f9a0dbee7f2913.
-rw-r--r--classes/Memcached_DataObject.php14
1 files changed, 12 insertions, 2 deletions
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index b72c3d7b6..1608720d1 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -139,6 +139,16 @@ class Memcached_DataObject extends DB_DataObject
}
}
+ function keyTypes()
+ {
+ global $_DB_DATAOBJECT;
+ if (!isset($_DB_DATAOBJECT['INI'][$this->_database][$this->__table."__keys"])) {
+ $this->databaseStructure();
+
+ }
+ return $_DB_DATAOBJECT['INI'][$this->_database][$this->__table."__keys"];
+ }
+
function encache()
{
$c = $this->memcache();
@@ -147,7 +157,7 @@ class Memcached_DataObject extends DB_DataObject
} else {
$pkey = array();
$pval = array();
- $types = $this->keys();
+ $types = $this->keyTypes();
ksort($types);
foreach ($types as $key => $type) {
if ($type == 'K') {
@@ -172,7 +182,7 @@ class Memcached_DataObject extends DB_DataObject
} else {
$pkey = array();
$pval = array();
- $types = $this->keys();
+ $types = $this->keyTypes();
ksort($types);
foreach ($types as $key => $type) {
if ($type == 'K') {