From 37e12547493924db6901818ae52a6dbb716a6d2b Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Mon, 25 Nov 2024 23:38:59 +0000 Subject: 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 --- app/models/wiki_content_version.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/wiki_content_version.rb b/app/models/wiki_content_version.rb index 78e056649..79941bf41 100644 --- 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 -- cgit v1.2.3