diff --git a/user_relationships_ui/user_relationships_ui.module b/user_relationships_ui/user_relationships_ui.module index 11dac85..8ee30ed 100644 --- a/user_relationships_ui/user_relationships_ui.module +++ b/user_relationships_ui/user_relationships_ui.module @@ -98,14 +98,16 @@ function user_relationships_ui_actions_between($viewer, $viewed, $action_types = $relationships = user_relationships_load(array('between' => array($viewer->uid, $viewed->uid))); foreach ($relationships as $relationship) { if ($relationship->approved && !isset($list[$relationship->rid]) && user_relationships_ui_check_access('view', NULL, $relationship)) { + $this_user_str = $viewer->uid == $relationship->requestee_id ? 'requester' : 'requestee'; + $name = user_relationships_type_get_name($relationship, FALSE, $relationship->is_oneway && $this_user_str == 'requester', FALSE, !($relationship->is_oneway && $this_user_str == 'requester')); if (user_relationships_ui_check_access('delete', NULL, $relationship)) { $list[$relationship->rid] = 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), + '@rel_name' => $name . ($relationship->is_oneway ? ($relationship->requester_id == $viewer->uid ? t(' (You to Them)') : t(' (Them to You)')) : NULL), '!remove_link' => theme('user_relationships_remove_link', array('uid' => $viewer->uid, 'rid' => $relationship->rid)), )); } else { - $list[$relationship->rid] = user_relationships_type_get_name($relationship) . ($relationship->is_oneway ? ($relationship->requester_id == $viewer->uid ? t(' (You to Them)') : t(' (Them to You)')) : NULL); + $list[$relationship->rid] = $name . ($relationship->is_oneway ? ($relationship->requester_id == $viewer->uid ? t(' (You to Them)') : t(' (Them to You)')) : NULL); } } }