From ec380887f71a1eadc75bad0289f9a0dbee7f2913 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 3 Jan 2010 10:52:24 -1000
Subject: use keys() instead of keyTypes() so plugin data object work

---
 classes/Memcached_DataObject.php | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'classes')

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') {
-- 
cgit v1.2.3-54-g00ecf