From c51bf8546e6b776f8ac684890e90b7ff0e1bf3e9 Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 7 Apr 2008 15:32:31 +0000
Subject: Further adventures in getting things to delete correctly

git-svn-id: https://code.elgg.org/elgg/trunk@413 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/objects.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engine/lib/objects.php')

diff --git a/engine/lib/objects.php b/engine/lib/objects.php
index ff8ebd558..2ef9cd284 100644
--- a/engine/lib/objects.php
+++ b/engine/lib/objects.php
@@ -128,7 +128,7 @@
 			if (!parent::delete())
 				return false;
 				
-			return delete_object_entity($guid);
+			return delete_object_entity($this->get('guid'));
 		}
 	
 		/**
@@ -223,7 +223,7 @@
 		
 		$guid = (int)$guid;
 		
-		$row = get_entity_as_row($guid);
+		$row = get_object_entity_as_row($guid);
 		
 		// Check to see if we have access and it exists
 		if ($row) 
@@ -231,7 +231,7 @@
 			// Delete any existing stuff
 			return delete_data("DELETE from {$CONFIG->dbprefix}objects_entity where guid=$guid");
 		}
-		
+
 		return false;
 	}
 
-- 
cgit v1.2.3