From 36ef345eb6425106f061fb866d9fa66d051e16df Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 5 Apr 2010 16:08:42 +0000
Subject: Merged 5530:5604 from 1.7 to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@5622 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 actions/admin/user/makeadmin.php   | 7 +++----
 actions/admin/user/removeadmin.php | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'actions/admin')

diff --git a/actions/admin/user/makeadmin.php b/actions/admin/user/makeadmin.php
index 580e7df05..dc5c508fb 100644
--- a/actions/admin/user/makeadmin.php
+++ b/actions/admin/user/makeadmin.php
@@ -15,11 +15,10 @@ admin_gatekeeper();
 
 // Get the user
 $guid = get_input('guid');
-$obj = get_entity($guid);
+$user = get_entity($guid);
 
-if (($obj instanceof ElggUser) && ($obj->canEdit())) {
-	$obj->admin = 'yes';
-	if ($obj->admin) {
+if (($user instanceof ElggUser) && ($user->canEdit())) {
+	if ($user->makeAdmin()) {
 		system_message(elgg_echo('admin:user:makeadmin:yes'));
 	} else {
 		register_error(elgg_echo('admin:user:makeadmin:no'));
diff --git a/actions/admin/user/removeadmin.php b/actions/admin/user/removeadmin.php
index 445596331..b5872e592 100644
--- a/actions/admin/user/removeadmin.php
+++ b/actions/admin/user/removeadmin.php
@@ -15,11 +15,10 @@ admin_gatekeeper();
 
 // Get the user
 $guid = get_input('guid');
-$obj = get_entity($guid);
+$user = get_entity($guid);
 
-if (($obj instanceof ElggUser) && ($obj->canEdit())) {
-	$obj->admin = '';
-	if (!$obj->admin) {
+if (($user instanceof ElggUser) && ($user->canEdit())) {
+	if ($user->removeAdmin()) {
 		system_message(elgg_echo('admin:user:removeadmin:yes'));
 	} else {
 		register_error(elgg_echo('admin:user:removeadmin:no'));
-- 
cgit v1.2.3