From aefcfc7b30d34beee4bfb063753b251fe9a4c7c7 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Tue, 11 Mar 2014 09:30:49 +0100
Subject: [PATCH] Show hovercards in the notification drop-down for users on
 the same pod

---
 Changelog.md                       | 1 +
 app/helpers/people_helper.rb       | 2 +-
 spec/helpers/people_helper_spec.rb | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 80ae85b39..ab7dd145d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -20,6 +20,7 @@
 * Fix active user statistics by saving a last seen timestamp for users [#4734](https://github.com/diaspora/diaspora/issues/4734)
 * Render HTML in atom user feed [#4835](https://github.com/diaspora/diaspora/pull/4835)
 * Fix plaintext mode of Mentionable [#4294](https://github.com/diaspora/diaspora/issues/4294)
+* Show hovercards in the notification drop-down for users on the same pod [#4843](https://github.com/diaspora/diaspora/pull/4843)
 
 ## Features
 * You can report a single post by clicking the correct icon in the controler section [#4517](https://github.com/diaspora/diaspora/pull/4517)
diff --git a/app/helpers/people_helper.rb b/app/helpers/people_helper.rb
index 6f5a9bafe..b162b6fc7 100644
--- a/app/helpers/people_helper.rb
+++ b/app/helpers/people_helper.rb
@@ -36,7 +36,7 @@ module PeopleHelper
     opts[:class] ||= ""
     opts[:class] << " self" if defined?(user_signed_in?) && user_signed_in? && current_user.person == person
     remote_or_hovercard_link = Rails.application.routes.url_helpers.person_path(person).html_safe
-    "<a data-hovercard='#{remote_or_hovercard_link}' #{person_href(person)} class='#{opts[:class]}' #{ ("target=" + opts[:target]) if opts[:target]}>#{h(person.name)}</a>".html_safe
+    "<a data-hovercard='#{remote_or_hovercard_link}' href='#{remote_or_hovercard_link}' class='#{opts[:class]}' #{ ("target=" + opts[:target]) if opts[:target]}>#{h(person.name)}</a>".html_safe
   end
 
   def person_image_tag(person, size = :thumb_small)
diff --git a/spec/helpers/people_helper_spec.rb b/spec/helpers/people_helper_spec.rb
index 82606eee6..f8ff42813 100644
--- a/spec/helpers/people_helper_spec.rb
+++ b/spec/helpers/people_helper_spec.rb
@@ -58,6 +58,10 @@ describe PeopleHelper do
       @person.profile.last_name = "I'm <h1>Evil"
       person_link(@person).should_not include("<h1>")
     end
+    
+    it 'links by id for a local user' do
+      person_link(@user.person).should include "href='#{person_path(@user.person)}'"
+    end
   end
 
   describe "#person_href" do