From: Tom Hughes <tom@compton.nu>
Date: Wed, 5 Sep 2018 18:01:24 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1973'
X-Git-Tag: live~2853
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/70cca71f3802519eac1fabaeb3ee1cc9f35f5cb7

Merge remote-tracking branch 'upstream/pull/1973'
---

70cca71f3802519eac1fabaeb3ee1cc9f35f5cb7
diff --cc app/helpers/issues_helper.rb
index 092050bf1,474249648..4ecd7001a
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@@ -2,11 -2,11 +2,11 @@@ module IssuesHelpe
    def reportable_url(reportable)
      case reportable
      when DiaryEntry
-       url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.user.display_name, :id => reportable.id)
+       diary_entry_url(reportable.user, reportable)
      when User
 -      url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.display_name)
 +      user_url(reportable)
      when DiaryComment
-       url_for(:controller => reportable.diary_entry.class.name.underscore, :action => :view, :display_name => reportable.diary_entry.user.display_name, :id => reportable.diary_entry.id, :anchor => "comment#{reportable.id}")
+       diary_entry_url(reportable.diary_entry.user, reportable.diary_entry, :anchor => "comment#{reportable.id}")
      when Note
        url_for(:controller => :browse, :action => :note, :id => reportable.id)
      end