aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-11-06 18:55:06 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-11-06 18:55:06 +0000
commitfc110d63a3eb1afdd96d4a832239405b6ff6bcb0 (patch)
tree84cb8607238d2abd7a641003ac8be0ba6f26888b
parent40f717cad9b54511d6d4c0d549fd253409f8dd12 (diff)
downloadelgg-fc110d63a3eb1afdd96d4a832239405b6ff6bcb0.tar.gz
elgg-fc110d63a3eb1afdd96d4a832239405b6ff6bcb0.tar.bz2
Reverted limited caching back to array since caching objects don't work so well for these.
git-svn-id: https://code.elgg.org/elgg/trunk@2418 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/entities.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index d1c4ba3eb..09f5f38f5 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -921,7 +921,7 @@
global $ENTITY_CACHE;
if (!$ENTITY_CACHE)
- $ENTITY_CACHE = select_default_memcache('entity_cache'); // TODO: Replace with memcache?
+ $ENTITY_CACHE = array(); //select_default_memcache('entity_cache'); // TODO: Replace with memcache?
}
/**
@@ -935,8 +935,8 @@
$guid = (int)$guid;
- //unset($ENTITY_CACHE[$guid]);
- $ENTITY_CACHE->delete($guid);
+ unset($ENTITY_CACHE[$guid]);
+ //$ENTITY_CACHE->delete($guid);
}
/**
@@ -1014,7 +1014,7 @@
if ($result) {
if (!$SUBTYPE_CACHE)
- $SUBTYPE_CACHE = select_default_memcache('subtype_cache');
+ $SUBTYPE_CACHE = array(); //select_default_memcache('subtype_cache');
$SUBTYPE_CACHE[$result->id] = $result;
return $result->id;
@@ -1045,7 +1045,7 @@
if ($result) {
if (!$SUBTYPE_CACHE)
- $SUBTYPE_CACHE = select_default_memcache('subtype_cache');
+ $SUBTYPE_CACHE = array(); //select_default_memcache('subtype_cache');
$SUBTYPE_CACHE[$subtype_id] = $result;
return $result->subtype;
@@ -1074,7 +1074,7 @@
if ($result) {
if (!$SUBTYPE_CACHE)
- $SUBTYPE_CACHE = select_default_memcache('subtype_cache');
+ $SUBTYPE_CACHE = array(); //select_default_memcache('subtype_cache');
$SUBTYPE_CACHE[$result->id] = $result;
return $result->class;
@@ -1104,7 +1104,7 @@
if ($result) {
if (!$SUBTYPE_CACHE)
- $SUBTYPE_CACHE = select_default_memcache('subtype_cache');
+ $SUBTYPE_CACHE = array(); //select_default_memcache('subtype_cache');
$SUBTYPE_CACHE[$subtype_id] = $result;
return $result->class;