Closes 868: Fixes regression introduced in [3119]. Version number bumped.

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

1 files changed, 8 insertions, 31 deletions

diff --git a/engine/lib/users.php b/engine/lib/users.php
index 630be8d80..283f5efcc 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -146,19 +146,6 @@
 		}

 		

 		/**

-		 * Delete this user.

-		 * @return true|false

-		 */

-		public function delete() 

-		{ 
-			if (parent::delete())

-				return delete_user_entity($this->get('guid'));

-				

-			return false;

-				

-		}

-		

-		/**

 		 * Ban this user.

 		 *

 		 * @param string $reason Optional reason

@@ -496,28 +483,18 @@
 		return false;

 	}

 	

-	/**

-	 * Delete a user's extra data.

+	/**
+	 * THIS FUNCTION IS DEPRECATED.
+	 * 

+	 * Delete a user's extra data. 

 	 * 

 	 * @param int $guid

 	 */

 	function delete_user_entity($guid)

-	{

-		global $CONFIG;

-		

-		$guid = (int)$guid;

-		

-		$row = get_entity_as_row($guid);

-		

-		// Check to see if we have access and it exists

-		if ($row) 

-		{

-			//disable_user_entities($guid);

-			// Delete any existing stuff

-			return delete_data("DELETE from {$CONFIG->dbprefix}users_entity where guid=$guid");

-		}

-		

-		return false;

+	{
+		system_message(sprintf(elgg_echo('deprecatedfunction'), 'delete_user_entity'));
+		
+		return 1; // Always return that we have deleted one row in order to not break existing code.

 	}

 

 	/**