forked from GNUsocial/gnu-social
Revert "use keys() instead of keyTypes() so plugin data object work"
This reverts commit ec380887f7
.
This commit is contained in:
parent
e940790241
commit
d5fb88e1c0
@ -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()
|
function encache()
|
||||||
{
|
{
|
||||||
$c = $this->memcache();
|
$c = $this->memcache();
|
||||||
@ -147,7 +157,7 @@ class Memcached_DataObject extends DB_DataObject
|
|||||||
} else {
|
} else {
|
||||||
$pkey = array();
|
$pkey = array();
|
||||||
$pval = array();
|
$pval = array();
|
||||||
$types = $this->keys();
|
$types = $this->keyTypes();
|
||||||
ksort($types);
|
ksort($types);
|
||||||
foreach ($types as $key => $type) {
|
foreach ($types as $key => $type) {
|
||||||
if ($type == 'K') {
|
if ($type == 'K') {
|
||||||
@ -172,7 +182,7 @@ class Memcached_DataObject extends DB_DataObject
|
|||||||
} else {
|
} else {
|
||||||
$pkey = array();
|
$pkey = array();
|
||||||
$pval = array();
|
$pval = array();
|
||||||
$types = $this->keys();
|
$types = $this->keyTypes();
|
||||||
ksort($types);
|
ksort($types);
|
||||||
foreach ($types as $key => $type) {
|
foreach ($types as $key => $type) {
|
||||||
if ($type == 'K') {
|
if ($type == 'K') {
|
||||||
|
Loading…
Reference in New Issue
Block a user