From a94092e4ff25fa72285e20e5f752b37c7c03bcb9 Mon Sep 17 00:00:00 2001 From: Robert Keresnyei Date: Sat, 13 Jan 2024 22:04:48 +0100 Subject: [PATCH 1/2] Fix Propshaft encoding issue --- lib/wicked_pdf/wicked_pdf_helper/assets.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/wicked_pdf/wicked_pdf_helper/assets.rb b/lib/wicked_pdf/wicked_pdf_helper/assets.rb index c145e932..17b82a81 100644 --- 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 From 0566afce9a4c4ccd9f3a8f14b7ef0a702132113a Mon Sep 17 00:00:00 2001 From: Robert Keresnyei Date: Mon, 15 Jan 2024 15:40:57 +0100 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e68a2b6c..7547487d 100644 --- 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)