diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 1e62b878a..2b81cb5c5 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -694,6 +694,8 @@ module ApplicationHelper
end
def time_tag(time)
+ return if time.nil?
+
text = distance_of_time_in_words(Time.now, time)
if @project
link_to(text,
diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index b4d194da9..1048dea4d 100644
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -2211,6 +2211,22 @@ class ApplicationHelperTest < Redmine::HelperTest
end
end
+ def test_time_tag
+ user = User.find(1)
+ user.pref.update(time_zone: 'UTC')
+ User.current = user
+
+ assert_nil time_tag(nil)
+ with_locale 'en' do
+ travel_to Time.zone.parse('2022-12-30T01:00:00Z') do
+ assert_equal "2 days", time_tag(2.days.ago)
+
+ @project = Project.find(1)
+ assert_equal "2 days", time_tag(2.days.ago)
+ end
+ end
+ end
+
private
def wiki_links_with_special_characters