summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-01-03 10:52:24 -1000
committerEvan Prodromou <evan@status.net>2010-01-03 10:52:24 -1000
commitec380887f71a1eadc75bad0289f9a0dbee7f2913 (patch)
tree317a2a72c993645f26a1bd8c64e4c5b3cc645ee8
parent121c696267ffa863df7475d5dd7e45d41db33023 (diff)
use keys() instead of keyTypes() so plugin data object work
-rw-r--r--classes/Memcached_DataObject.php14
1 files changed, 2 insertions, 12 deletions
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 1608720d1..b72c3d7b6 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -139,16 +139,6 @@ 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();
@@ -157,7 +147,7 @@ class Memcached_DataObject extends DB_DataObject
} else {
$pkey = array();
$pval = array();
- $types = $this->keyTypes();
+ $types = $this->keys();
ksort($types);
foreach ($types as $key => $type) {
if ($type == 'K') {
@@ -182,7 +172,7 @@ class Memcached_DataObject extends DB_DataObject
} else {
$pkey = array();
$pval = array();
- $types = $this->keyTypes();
+ $types = $this->keys();
ksort($types);
foreach ($types as $key => $type) {
if ($type == 'K') {