From 24a369c78df14469097dd440bba3cee087a39e7b Mon Sep 17 00:00:00 2001
From: Brett Profitt <brett.profitt@gmail.com>
Date: Wed, 4 Jan 2012 15:05:21 -0800
Subject: Fixes #3710. Returning false from update, <type> event no longer
 deletes entity. Returning false from create, <type> still deletes the entity
 because of the "return false to halt events" approach. This will be reviewed
 for #3784.

---
 engine/lib/objects.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

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

diff --git a/engine/lib/objects.php b/engine/lib/objects.php
index 63d0f5cef..f186c66cb 100644
--- a/engine/lib/objects.php
+++ b/engine/lib/objects.php
@@ -52,11 +52,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.
-- 
cgit v1.2.3