diff options
| author | Go MAEDA <maeda@farend.jp> | 2024-11-25 23:38:59 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2024-11-25 23:38:59 +0000 |
| commit | 37e12547493924db6901818ae52a6dbb716a6d2b (patch) | |
| tree | f600b99116b4236c55e732e5d4c4f407a45c2b98 /app | |
| parent | 63fa6f28227eecff548dd9aa8cc6152394eaa2e7 (diff) | |
| download | redmine-37e12547493924db6901818ae52a6dbb716a6d2b.tar.gz redmine-37e12547493924db6901818ae52a6dbb716a6d2b.zip | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/wiki_content_version.rb | 3 |
1 files changed, 1 insertions, 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 |