Revert "use keys() instead of keyTypes() so plugin data object work"

This reverts commit ec380887f71a1eadc75bad0289f9a0dbee7f2913.

diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index b72c3d7b6766aec6997abee8a9110e7c9c9f53af..1608720d14072980187db8ba0cfb682a9d2d0334 100644 (file)
--- 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') {