From 64e853394c120888a7555901a52c5868f33aef3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Fri, 25 Jan 2013 12:46:32 +0100
Subject: [PATCH] compare the correct uids
---
settings/templates/users.php | 2 +-
settings/users.php | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 6cbbca2404..44e9b5bafe 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -157,7 +157,7 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
</div>
</td>
<td class="remove">
- <?php if($user['name']!=OC_User::getUser()):?>
+ <?php if($user['uid']!=OC_User::getUser()):?>
<a href="#" class="action delete" original-title="<?php echo $l->t('Delete')?>">
<img src="<?php echo image_path('core', 'actions/delete.svg') ?>" />
</a>
diff --git a/settings/users.php b/settings/users.php
index bf27e80441..c8f5ef5ff3 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -53,6 +53,7 @@ foreach($accessibleusers as $displayName => $uid) {
$users[] = array(
"name" => $name,
+ "uid" => $uid,
"groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($uid)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/),
'quota'=>$quota,
'isQuotaUserDefined'=>$isQuotaUserDefined,
--
GitLab