Merged r24415 from trunk to 6.1-stable (#33610).

git-svn-id: https://svn.redmine.org/redmine/branches/6.1-stable@24420 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/models/issue.rb

@@ -2016,7 +2016,7 @@ class Issue < ApplicationRecord
   # Make sure updated_on is updated when adding a note and set updated_on now
   # so we can set closed_on with the same value on closing
   def force_updated_on_change
-    if @current_journal || changed?
+    if changed? || (@current_journal && !@current_journal.notes_and_details_empty?)
       self.updated_on = current_time_from_proper_timezone
       if new_record?
         self.created_on = updated_on

app/models/journal.rb

@@ -102,7 +102,11 @@ class Journal < ApplicationRecord
   def save(*args)
     journalize_changes
     # Do not save an empty journal
-    (details.empty? && notes.blank?) ? false : super()
+    notes_and_details_empty? ? false : super()
+  end
+
+  def notes_and_details_empty?
+    notes.blank? && details.empty?
   end
 
   def journalized