| @@ -14,13 +14,12 @@ | ||
| 14 | 14 | * @version SVN: $Id$ |
| 15 | 15 | * @link http://wordpress.org/extend/plugins/user-access-manager/ |
| 16 | 16 | */ |
| 17 | 17 | |
| 18 | -$objectId = $id; | |
| 19 | 18 | global $userAccessManager; |
| 20 | 19 | |
| 21 | 20 | $uamUserGroups |
| 22 | - = $userAccessManager->getAccessHandler()->getUsergroupsForUser($objectId); | |
| 21 | + = $userAccessManager->getAccessHandler()->getUsergroupsForObject($objectType, $objectId); | |
| 23 | 22 | $userGroupsForObject = &$uamUserGroups; |
| 24 | 23 | |
| 25 | 24 | if ($uamUserGroups != Array()) { |
| 26 | 25 | ?> |
| @@ -31,9 +30,9 @@ | ||
| 31 | 30 | <li> |
| 32 | 31 | <a class="uam_group_info_link"> |
| 33 | 32 | <?php echo $uamUserGroup->getGroupName(); ?> |
| 34 | 33 | </a> |
| 35 | - <?php | |
| 34 | + <?php | |
| 36 | 35 | include 'groupInfo.php'; |
| 37 | 36 | ?> |
| 38 | 37 | </li> |
| 39 | 38 | <?php |
| @@ -43,12 +42,10 @@ | ||
| 43 | 42 | <?php |
| 44 | 43 | } else { |
| 45 | 44 | global $wpdb; |
| 46 | 45 | |
| 47 | - $userData = get_userdata($id); | |
| 48 | - | |
| 49 | - if (empty($userData->{$wpdb->prefix . "capabilities"}['administrator'])) { | |
| 46 | + if (!$userAccessManager->getAccessHandler()->userIsAdmin($objectId)) { | |
| 50 | 47 | echo TXT_NONE; |
| 51 | 48 | } else { |
| 52 | 49 | echo TXT_ADMIN_HINT; |
| 53 | 50 | } |
| 54 | 51 | } |
