Reversed delete procedure on entities, parent now checked first before sub deleted. Any stubs left over will be handled by the garbage collector.

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

1 files changed, 4 insertions, 6 deletions

diff --git a/engine/lib/group.php b/engine/lib/group.php
index 05c4f1262..28f6eaa10 100644
--- a/engine/lib/group.php
+++ b/engine/lib/group.php
@@ -261,12 +261,10 @@
 		 */

 		public function delete() 

 		{ 

-			

-			if (!delete_group_entity($this->get('guid')))

-				return false;

-				

-			return parent::delete();

-				

+			if (parent::delete())

+				return delete_group_entity($this->get('guid'));
+				
+			return false;

 		}