Closes #957: Annotations and metadata owned by a deleted user are now also deleted.

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

1 files changed, 15 insertions, 0 deletions

diff --git a/engine/lib/users.php b/engine/lib/users.php
index e45223e54..5a9234dc6 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -143,6 +143,21 @@
 		

 			// Now save specific stuff

 			return create_user_entity($this->get('guid'), $this->get('name'), $this->get('username'), $this->get('password'), $this->get('salt'), $this->get('email'), $this->get('language'), $this->get('code'));

+		}
+		
+		/**
+		 * User specific override of the entity delete method.
+		 *
+		 * @return bool
+		 */
+		public function delete()
+		{
+			// Delete owned data
+			clear_annotations_by_owner($this->owner_guid);
+			clear_metadata_by_owner($this->owner_guid);
+			
+			// Delete entity
+			return parent::delete();
 		}

 		

 		/**