X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a0dc300840c236d6460c0641f8a9f47246815ad1..0abd8ea78d8ea37f14145c973a523ef53bca84ef:/app/helpers/issues_helper.rb

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 092050bf1..e6c1adb16 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -2,11 +2,11 @@ module IssuesHelper
   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
       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
@@ -28,9 +28,9 @@ module IssuesHelper
   def open_issues_count
     count = Issue.visible_to(current_user).open.limit(100).size
     if count > 99
-      content_tag(:span, "99+", :class => "count-number")
-    elsif count > 0
-      content_tag(:span, count, :class => "count-number")
+      tag.span("99+", :class => "count-number")
+    elsif count.positive?
+      tag.span(count, :class => "count-number")
     end
   end
 end