Refs #617: ElggUser:makeAdmin() and removeAdmin() correctly set the attribute for unsaved users.

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

1 files changed, 16 insertions, 8 deletions

diff --git a/engine/classes/ElggUser.php b/engine/classes/ElggUser.php
index e887b271e..3bd93bba2 100644
--- a/engine/classes/ElggUser.php
+++ b/engine/classes/ElggUser.php
@@ -204,11 +204,15 @@ class ElggUser extends ElggEntity
 	 * @return bool
 	 */
 	public function makeAdmin() {
-		if (make_user_admin($this->guid)) {
-			$this->attributes['admin'] = 'yes';
-			return TRUE;
+		// If already saved, use the standard function.
+		if ($this->guid && !make_user_admin($this->guid)) {
+			return FALSE;
 		}
-		return FALSE;
+
+		// need to manually set attributes since they've already been loaded.
+		$this->attributes['admin'] = 'yes';
+
+		return TRUE;
 	}
 
 	/**
@@ -217,11 +221,15 @@ class ElggUser extends ElggEntity
 	 * @return bool
 	 */
 	public function removeAdmin() {
-		if (remove_user_admin($this->guid)) {
-			$this->attributes['admin'] = 'no';
-			return TRUE;
+		// If already saved, use the standard function.
+		if ($this->guid && !remove_user_admin($this->guid)) {
+			return FALSE;
 		}
-		return FALSE;
+
+		// need to manually set attributes since they've already been loaded.
+		$this->attributes['admin'] = 'no';
+
+		return TRUE;
 	}
 
 	/**