From d5fb88e1c0a617423a6fd9f9a23141c36245f38c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 3 Jan 2010 11:24:05 -1000
Subject: [PATCH] Revert "use keys() instead of keyTypes() so plugin data
 object work"

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

diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index b72c3d7b67..1608720d14 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') {