From 4566ee4a43d5656e7695d9da6dab97e843910a3e Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Sun, 7 Jan 2018 12:20:04 +0100 Subject: decodeUtf8 over unsafe unpack for feed templates --- lib/Hakyll/Web/Feed.hs | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/Hakyll/Web/Feed.hs b/lib/Hakyll/Web/Feed.hs index 916a2fa..2cafe02 100644 --- a/lib/Hakyll/Web/Feed.hs +++ b/lib/Hakyll/Web/Feed.hs @@ -28,29 +28,34 @@ module Hakyll.Web.Feed -------------------------------------------------------------------------------- import Hakyll.Core.Compiler import Hakyll.Core.Item -import Hakyll.Core.Util.String (replaceAll) +import Hakyll.Core.Util.String (replaceAll) import Hakyll.Web.Template import Hakyll.Web.Template.Context import Hakyll.Web.Template.List -------------------------------------------------------------------------------- -import Data.ByteString.Char8 (unpack) -import Data.FileEmbed (embedFile) +import Data.FileEmbed (embedFile) +import qualified Data.Text as T +import qualified Data.Text.Encoding as T -------------------------------------------------------------------------------- rssTemplate :: String -rssTemplate = unpack $(embedFile "data/templates/rss.xml") +rssTemplate = T.unpack $ + T.decodeUtf8 $(embedFile "data/templates/rss.xml") rssItemTemplate :: String -rssItemTemplate = unpack $(embedFile "data/templates/rss-item.xml") +rssItemTemplate = T.unpack $ + T.decodeUtf8 $(embedFile "data/templates/rss-item.xml") atomTemplate :: String -atomTemplate = unpack $(embedFile "data/templates/atom.xml") +atomTemplate = T.unpack $ + T.decodeUtf8 $(embedFile "data/templates/atom.xml") atomItemTemplate :: String -atomItemTemplate = unpack $(embedFile "data/templates/atom-item.xml") +atomItemTemplate = T.unpack $ + T.decodeUtf8 $(embedFile "data/templates/atom-item.xml") -------------------------------------------------------------------------------- -- cgit v1.2.3