1 files changed, 8 insertions, 25 deletions

diff --git a/engine/lib/objects.php b/engine/lib/objects.php
index 8819a1094..ff3cc733f 100644
--- a/engine/lib/objects.php
+++ b/engine/lib/objects.php
@@ -13,6 +13,7 @@
  * @param int $guid The guid to retreive
  *
  * @return bool
+ * @access private
  */
 function get_object_entity_as_row($guid) {
 	global $CONFIG;
@@ -30,6 +31,7 @@ function get_object_entity_as_row($guid) {
  * @param string $description The object's description
  *
  * @return bool
+ * @access private
  */
 function create_object_entity($guid, $title, $description) {
 	global $CONFIG;
@@ -51,11 +53,8 @@ function create_object_entity($guid, $title, $description) {
 			if ($result != false) {
 				// Update succeeded, continue
 				$entity = get_entity($guid);
-				if (elgg_trigger_event('update', $entity->type, $entity)) {
-					return $guid;
-				} else {
-					$entity->delete();
-				}
+				elgg_trigger_event('update', $entity->type, $entity);
+				return $guid;
 			}
 		} else {
 			// Update failed, attempt an insert.
@@ -78,23 +77,6 @@ function create_object_entity($guid, $title, $description) {
 }
 
 /**
- * THIS FUNCTION IS DEPRECATED.
- *
- * Delete a object's extra data.
- *
- * @todo - this should be removed - was deprecated in 1.5 or earlier
- *
- * @param int $guid GUID
- *
- * @return 1
- */
-function delete_object_entity($guid) {
-	system_message(elgg_echo('deprecatedfunction', array('delete_user_entity')));
-
-	return 1; // Always return that we have deleted one row in order to not break existing code.
-}
-
-/**
  * Get the sites this object is part of
  *
  * @param int $object_guid The object's GUID
@@ -111,21 +93,22 @@ function get_object_sites($object_guid, $limit = 10, $offset = 0) {
 	return elgg_get_entities_from_relationship(array(
 		'relationship' => 'member_of_site',
 		'relationship_guid' => $object_guid,
-		'types' => 'site',
+		'type' => 'site',
 		'limit' => $limit,
-		'offset' => $offset
+		'offset' => $offset,
 	));
 }
 
 /**
  * Runs unit tests for ElggObject
  *
- * @param sting  $hook   unit_test
+ * @param string  $hook   unit_test
  * @param string $type   system
  * @param mixed  $value  Array of tests
  * @param mixed  $params Params
  *
  * @return array
+ * @access private
  */
 function objects_test($hook, $type, $value, $params) {
 	global $CONFIG;