Merge pull request #1096 from yenshirak/propshaft-fix

Fix Propshaft encoding issue
mileszs · Jan 23, 2024 · 9221f6d · 9221f6d
2 parents 0d056ea + 0566afc
commit 9221f6d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [master branch] - Unreleased
 ### Breaking Changes
 
+### Fixes
+- [Fix Propshaft encoding issue](https://github.com/mileszs/wicked_pdf/pull/1096)
+
 ## [2.7.0]
 ### New Features
 - [Support Shakapacker 7](https://github.com/mileszs/wicked_pdf/pull/1067)

diff --git a/lib/wicked_pdf/wicked_pdf_helper/assets.rb b/lib/wicked_pdf/wicked_pdf_helper/assets.rb
@@ -183,7 +183,7 @@ def read_asset(source)
             IO.read(pathname)
           end
         else
-          find_asset(source).to_s
+          find_asset(source).to_s.force_encoding('UTF-8')
         end
       end