From ce3c90921858768d6abb6c8f6a9352944fad0a2f Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Tue, 9 Aug 2011 10:24:51 -0700
Subject: [PATCH] update to xss-sanitize 0.3

---
 yesod-form/Yesod/Form/Fields.hs | 4 ++--
 yesod-form/Yesod/Form/Nic.hs    | 6 +++---
 yesod-form/yesod-form.cabal     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/yesod-form/Yesod/Form/Fields.hs b/yesod-form/Yesod/Form/Fields.hs
index 1e24754c..a73cf845 100644
--- a/yesod-form/Yesod/Form/Fields.hs
+++ b/yesod-form/Yesod/Form/Fields.hs
@@ -32,7 +32,7 @@ import Yesod.Form.Types
 import Yesod.Widget
 import Yesod.Message (RenderMessage, SomeMessage (..))
 import Text.Hamlet
-import Text.Blaze (ToHtml (..), preEscapedString, unsafeByteString)
+import Text.Blaze (ToHtml (..), preEscapedText, unsafeByteString)
 import Text.Cassius
 import Data.Time (Day, TimeOfDay(..))
 import qualified Text.Email.Validate as Email
@@ -171,7 +171,7 @@ timeField = Field
 
 htmlField :: RenderMessage master FormMessage => Field sub master Html
 htmlField = Field
-    { fieldParse = blank $ Right . preEscapedString . sanitizeBalance . unpack -- FIXME make changes to xss-sanitize
+    { fieldParse = blank $ Right . preEscapedText . sanitizeBalance
     , fieldView = \theId name val _isReq -> addHamlet
         [HAMLET|\
 <textarea id="#{theId}" name="#{name}" .html>#{showVal val}
diff --git a/yesod-form/Yesod/Form/Nic.hs b/yesod-form/Yesod/Form/Nic.hs
index 52ef10a5..22cb5c92 100644
--- a/yesod-form/Yesod/Form/Nic.hs
+++ b/yesod-form/Yesod/Form/Nic.hs
@@ -17,9 +17,9 @@ import Text.HTML.SanitizeXSS (sanitizeBalance)
 import Text.Hamlet (Html, html)
 import Text.Julius (julius)
 import Text.Blaze.Renderer.String (renderHtml)
-import Text.Blaze (preEscapedString)
+import Text.Blaze (preEscapedText)
 import Control.Monad.Trans.Class (lift)
-import Data.Text (Text, pack, unpack)
+import Data.Text (Text, pack)
 import Data.Maybe (listToMaybe)
 
 class YesodNic a where
@@ -29,7 +29,7 @@ class YesodNic a where
 
 nicHtmlField :: YesodNic master => Field sub master Html
 nicHtmlField = Field
-    { fieldParse = return . Right . fmap (preEscapedString . sanitizeBalance . unpack) . listToMaybe -- FIXME
+    { fieldParse = return . Right . fmap (preEscapedText . sanitizeBalance) . listToMaybe
     , fieldView = \theId name val _isReq -> do
         addHtml
 #if __GLASGOW_HASKELL__ >= 700
diff --git a/yesod-form/yesod-form.cabal b/yesod-form/yesod-form.cabal
index 53ccec7c..21f85516 100644
--- a/yesod-form/yesod-form.cabal
+++ b/yesod-form/yesod-form.cabal
@@ -23,7 +23,7 @@ library
                    , template-haskell
                    , transformers              >= 0.2.2    && < 0.3
                    , data-default              >= 0.3      && < 0.4
-                   , xss-sanitize              >= 0.2.4    && < 0.3
+                   , xss-sanitize              >= 0.3      && < 0.4
                    , blaze-builder             >= 0.2.1    && < 0.4
                    , network                   >= 2.2      && < 2.4
                    , email-validate            >= 0.2.6    && < 0.3