aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoricewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-06-09 17:16:54 +0000
committericewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-06-09 17:16:54 +0000
commit1124c6e9a16cdc5b9f7d31499faefbccaccdab7a (patch)
treebe8029beda2965b3503c3f8f54cf8fc29a2adc51
parentf2b8841f68f4a0c47a06fb063413b7b2317a9533 (diff)
downloadelgg-1124c6e9a16cdc5b9f7d31499faefbccaccdab7a.tar.gz
elgg-1124c6e9a16cdc5b9f7d31499faefbccaccdab7a.tar.bz2
Marcus Povey <marcus@dushka.co.uk>
* Caching complete git-svn-id: https://code.elgg.org/elgg/trunk@843 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/entities.php2
-rw-r--r--engine/lib/objects.php2
-rw-r--r--engine/lib/sites.php2
-rw-r--r--engine/lib/users.php2
4 files changed, 4 insertions, 4 deletions
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index cf0e544b6..f95993dcb 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -724,7 +724,7 @@
$guid = (int)$guid;
if (isset($ENTITY_CACHE[$guid]))
- return $ENTITY_CACHE[$guid];
+ if ($ENTITY_CACHE[$guid]->isFullyLoaded()) return $ENTITY_CACHE[$guid];
return false;
}
diff --git a/engine/lib/objects.php b/engine/lib/objects.php
index 7ade3b475..925cf6c88 100644
--- a/engine/lib/objects.php
+++ b/engine/lib/objects.php
@@ -196,7 +196,7 @@
$guid = (int)$guid;
$row = retrieve_cached_entity_row($guid);
- if ($row->isFullyLoaded())
+ if ($row)
{
// We have already cached this object, so retrieve its value from the cache
if ($CONFIG->debug)
diff --git a/engine/lib/sites.php b/engine/lib/sites.php
index 4aace3f47..f4478445a 100644
--- a/engine/lib/sites.php
+++ b/engine/lib/sites.php
@@ -228,7 +228,7 @@
$guid = (int)$guid;
$row = retrieve_cached_entity_row($guid);
- if ($row->isFullyLoaded())
+ if ($row)
{
// We have already cached this object, so retrieve its value from the cache
if ($CONFIG->debug)
diff --git a/engine/lib/users.php b/engine/lib/users.php
index d494cfb7c..cece8b91d 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -317,7 +317,7 @@
global $CONFIG;
$row = retrieve_cached_entity_row($guid);
- if ($row->isFullyLoaded())
+ if ($row)
{
// We have already cached this object, so retrieve its value from the cache
if ($CONFIG->debug)