Merged r23308 from trunk to 6.0-stable (#41860).

git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@23314 e93f8b46-1217-0410-a6f0-8f06a7374b81
2026-05-06 08:37:35 +02:00 · 2024-11-25 23:38:59 +00:00
parent 63fa6f2822
commit 37e1254749
1 changed files with 1 additions and 2 deletions
--- a/app/models/wiki_content_version.rb
+++ b/app/models/wiki_content_version.rb
@@ -83,8 +83,7 @@ class WikiContentVersion < ApplicationRecord
              # uncompressed data
              data
            end
-      str.force_encoding("UTF-8")
-      str
+      (+str).force_encoding('UTF-8')
    end
  end