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 - "#{h(person.name)}".html_safe + "#{h(person.name)}".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