From bb04c9c62d2f55e7cef382955893fba934265618 Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 3 Mar 2009 12:29:43 +0000
Subject: Removed calls to the deprecated entity cache

git-svn-id: https://code.elgg.org/elgg/trunk@3028 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/entities.php | 6 +++---
 engine/lib/group.php    | 6 +++---
 engine/lib/objects.php  | 6 +++---
 engine/lib/sites.php    | 6 +++---
 engine/lib/users.php    | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index e9747d15c..d1402c397 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -1393,7 +1393,7 @@
 		
 		$guid = (int) $guid;
 		
-		$row = retrieve_cached_entity_row($guid);
+		/*$row = retrieve_cached_entity_row($guid);
 		if ($row)
 		{
 			// We have already cached this object, so retrieve its value from the cache
@@ -1403,7 +1403,7 @@
 			return $row;
 		}
 		else
-		{	
+		{*/	
 			// Object not cached, load it.
 			if (isset($CONFIG->debug) && $CONFIG->debug == true)
 				error_log("** GUID:$guid loaded from DB");
@@ -1411,7 +1411,7 @@
 			$access = get_access_sql_suffix();
 		
 			return get_data_row("SELECT * from {$CONFIG->dbprefix}entities where guid=$guid and $access");
-		}
+		//}
 	}
 	
 	/**
diff --git a/engine/lib/group.php b/engine/lib/group.php
index cff387298..05c4f1262 100644
--- a/engine/lib/group.php
+++ b/engine/lib/group.php
@@ -337,7 +337,7 @@
 		
 		$guid = (int)$guid;
 		
-		$row = retrieve_cached_entity_row($guid);
+		/*$row = retrieve_cached_entity_row($guid);
 		if ($row)
 		{
 			// We have already cached this object, so retrieve its value from the cache
@@ -347,13 +347,13 @@
 			return $row;
 		}
 		else
-		{
+		{*/
 			// Object not cached, load it.
 			if (isset($CONFIG->debug) && $CONFIG->debug == true)
 				error_log("** Sub part of GUID:$guid loaded from DB");
 		
 			return get_data_row("SELECT * from {$CONFIG->dbprefix}groups_entity where guid=$guid");
-		}
+		//}
 	}
 
 	/**
diff --git a/engine/lib/objects.php b/engine/lib/objects.php
index 599576e22..c049c51d2 100644
--- a/engine/lib/objects.php
+++ b/engine/lib/objects.php
@@ -228,7 +228,7 @@
 		
 		$guid = (int)$guid;
 		
-		$row = retrieve_cached_entity_row($guid);
+		/*$row = retrieve_cached_entity_row($guid);
 		if ($row)
 		{
 			// We have already cached this object, so retrieve its value from the cache
@@ -238,13 +238,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 3ebc76832..5fc646c17 100644
--- a/engine/lib/sites.php
+++ b/engine/lib/sites.php
@@ -242,7 +242,7 @@
 		
 		$guid = (int)$guid;
 		
-		$row = retrieve_cached_entity_row($guid);
+		/*$row = retrieve_cached_entity_row($guid);
 		if ($row)
 		{
 			// We have already cached this object, so retrieve its value from the cache
@@ -252,13 +252,13 @@
 			return $row;
 		}
 		else
-		{
+		{*/
 			// Object not cached, load it.
 			if (isset($CONFIG->debug) && $CONFIG->debug == true)
 				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 03206c65f..bfcea4b72 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -344,7 +344,7 @@
 	{
 		global $CONFIG;
 		
-		$row = retrieve_cached_entity_row($guid);
+		/*$row = retrieve_cached_entity_row($guid);
 		if ($row)
 		{
 			// We have already cached this object, so retrieve its value from the cache
@@ -354,7 +354,7 @@
 			return $row;
 		}
 		else
-		{
+		{*/
 			// Object not cached, load it.
 			if (isset($CONFIG->debug) && $CONFIG->debug == true)
 				error_log("** Sub part of GUID:$guid loaded from DB");
@@ -362,7 +362,7 @@
 			$guid = (int)$guid;
 		
 			return get_data_row("SELECT * from {$CONFIG->dbprefix}users_entity where guid=$guid");
-		}
+		//}
 	}
 	
 	/**
-- 
cgit v1.2.3