From f2b8841f68f4a0c47a06fb063413b7b2317a9533 Mon Sep 17 00:00:00 2001
From: icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 9 Jun 2008 17:08:26 +0000
Subject: git-svn-id: https://code.elgg.org/elgg/trunk@842
 36083f99-b078-4883-b0ff-0f9b5a30f544

---
 engine/lib/objects.php | 8 ++++----
 engine/lib/sites.php   | 8 ++++----
 engine/lib/users.php   | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'engine')

diff --git a/engine/lib/objects.php b/engine/lib/objects.php
index f838308f4..7ade3b475 100644
--- a/engine/lib/objects.php
+++ b/engine/lib/objects.php
@@ -195,8 +195,8 @@
 		
 		$guid = (int)$guid;
 		
-		/*$row = retrieve_cached_entity_row($guid);
-		if ($row)
+		$row = retrieve_cached_entity_row($guid);
+		if ($row->isFullyLoaded())
 		{
 			// We have already cached this object, so retrieve its value from the cache
 			if ($CONFIG->debug)
@@ -205,13 +205,13 @@
 			return $row;
 		}
 		else
-		{*/
+		{
 			// Object not cached, load it.
 			if ($CONFIG->debug)
 				error_log("** Sub part of GUID:$guid loaded from DB");
 		
 			return get_data_row("SELECT * from {$CONFIG->dbprefix}objects_entity where guid=$guid");
-		//}
+		}
 	}
 	
 	/**
diff --git a/engine/lib/sites.php b/engine/lib/sites.php
index 86a99525d..4aace3f47 100644
--- a/engine/lib/sites.php
+++ b/engine/lib/sites.php
@@ -227,8 +227,8 @@
 		
 		$guid = (int)$guid;
 		
-		/*$row = retrieve_cached_entity_row($guid);
-		if ($row)
+		$row = retrieve_cached_entity_row($guid);
+		if ($row->isFullyLoaded())
 		{
 			// We have already cached this object, so retrieve its value from the cache
 			if ($CONFIG->debug)
@@ -237,13 +237,13 @@
 			return $row;
 		}
 		else
-		{*/
+		{
 			// Object not cached, load it.
 			if ($CONFIG->debug)
 				error_log("** Sub part of GUID:$guid loaded from DB");
 		
 			return get_data_row("SELECT * from {$CONFIG->dbprefix}sites_entity where guid=$guid");
-		//}
+		}
 	}
 	
 	/**
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 33a192005..d494cfb7c 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -316,8 +316,8 @@
 	{
 		global $CONFIG;
 		
-		/*$row = retrieve_cached_entity_row($guid);
-		if ($row)
+		$row = retrieve_cached_entity_row($guid);
+		if ($row->isFullyLoaded())
 		{
 			// We have already cached this object, so retrieve its value from the cache
 			if ($CONFIG->debug)
@@ -326,7 +326,7 @@
 			return $row;
 		}
 		else
-		{*/
+		{
 			// Object not cached, load it.
 			if ($CONFIG->debug)
 				error_log("** Sub part of GUID:$guid loaded from DB");
@@ -334,7 +334,7 @@
 			$guid = (int)$guid;
 		
 			return get_data_row("SELECT * from {$CONFIG->dbprefix}users_entity where guid=$guid");
-		//}
+		}
 	}
 	
 	/**
-- 
cgit v1.2.3