From fc110d63a3eb1afdd96d4a832239405b6ff6bcb0 Mon Sep 17 00:00:00 2001 From: marcus Date: Thu, 6 Nov 2008 18:55:06 +0000 Subject: 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 --- engine/lib/entities.php | 14 +++++++------- 1 file 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; -- cgit v1.2.3