Further adventures in getting things to delete correctly

git-svn-id: https://code.elgg.org/elgg/trunk@413 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 3 insertions, 3 deletions

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;

 	}