From d748d456b5fc0a885fe93a45fa761f845767ab23 Mon Sep 17 00:00:00 2001 From: Raphael Date: Thu, 23 Sep 2010 16:21:08 -0700 Subject: [PATCH] Revert "fix in person partial" This reverts commit 8c0bc4b9e60e0e94fd515ba7f595e6d08fba34af. --- app/helpers/application_helper.rb | 6 +----- app/views/people/_person.html.haml | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b6e4c4389..89df26155 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -57,11 +57,7 @@ module ApplicationHelper end def person_image_link(person) - if current_user.friends.include?(person) || current_user.person == person - link_to person_image_tag(person), object_path(person) - else - person_image_tag person - end + link_to person_image_tag(person), object_path(person) end def new_request(request_count) diff --git a/app/views/people/_person.html.haml b/app/views/people/_person.html.haml index 185695db1..7e22a5570 100644 --- a/app/views/people/_person.html.haml +++ b/app/views/people/_person.html.haml @@ -8,10 +8,7 @@ .content %span.from - - if current_user.friends.include?(person) || person.id == current_user.person.id - = link_to person.real_name, person_path(person) - - else - = person.real_name + = link_to person.real_name, person_path(person) .info = person.diaspora_handle