compare the correct uids

diff --git a/settings/templates/users.php b/settings/templates/users.php
index 6cbbca2404952513d76c0813e20ddf77d311d6db..44e9b5bafeb86a17128a973abe0df395a260a677 100644 (file)
--- 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 bf27e80441191b1aa0a74a57c702752ddc275be7..c8f5ef5ff3ea823a7f4157342d96d22d9af4cf36 100644 (file)
--- 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,