diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-01-25 12:46:32 +0100 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-01-25 12:46:32 +0100 |
| commit | 64e853394c120888a7555901a52c5868f33aef3c (patch) | |
| tree | 86dd9cc14d86a5ffe88db01b92dcc1356daf39d7 | |
| parent | 4271430e609be252d9b4a69fd7b3590571c14f7c (diff) | |
| download | nextcloud-server-64e853394c120888a7555901a52c5868f33aef3c.tar.gz nextcloud-server-64e853394c120888a7555901a52c5868f33aef3c.zip | |
compare the correct uids
| -rw-r--r-- | settings/templates/users.php | 2 | ||||
| -rw-r--r-- | settings/users.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/settings/templates/users.php b/settings/templates/users.php index 6cbbca24049..44e9b5bafeb 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 bf27e804411..c8f5ef5ff3e 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, |