diff --git a/user_relationships_ui/user_relationships_ui.module b/user_relationships_ui/user_relationships_ui.module index 8ffed45..3ab505d 100644 --- a/user_relationships_ui/user_relationships_ui.module +++ b/user_relationships_ui/user_relationships_ui.module @@ -75,7 +75,7 @@ function user_relationships_ui_actions_between($viewer, $viewed, $action_types = if (isset($action_types['received'])) { $to_us = user_relationships_load(array('requester_id' => $viewed->uid, 'requestee_id' => $viewer->uid)); foreach ($to_us as $relationship) { - if (!$relationship->approved && (empty($rtids) || in_array($rtid, $rtids)) && user_relationships_user_access('maintain @relationship relationships', $relationship)) { + if (!$relationship->approved && (empty($rtids) || in_array($relationship->rtid, $rtids)) && user_relationships_user_access('maintain @relationship relationships', $relationship)) { $list[] = t('This user has requested to be your @rel_name. (!pending_requests)', array( '!pending_requests' => l(t('pending requests'), "user/{$viewer->uid}/relationships/received"), ) + user_relationships_type_translations($relationship)); @@ -104,7 +104,7 @@ function user_relationships_ui_actions_between($viewer, $viewed, $action_types = if (isset($action_types['remove'])) { foreach ($from_us as $relationship) { - if ($relationship->approved && (empty($rtids) || in_array($rtid, $rtids)) && !isset($list[$relationship->rid]) && user_relationships_ui_check_access('view', NULL, $relationship)) { + if ($relationship->approved && (empty($rtids) || in_array($relationship->rtid, $rtids)) && !isset($list[$relationship->rid]) && user_relationships_ui_check_access('view', NULL, $relationship)) { if (user_relationships_ui_check_access('delete', NULL, $relationship)) { $list[] = t('@rel_name (!remove_link)', array( '@rel_name' => user_relationships_type_get_name($relationship) . ($relationship->is_oneway ? ($relationship->requester_id == $viewer->uid ? t(' (You to Them)') : t(' (Them to You)')) : NULL),