From f158735dd68d9dc51e774a3c13bdc64262f06d0a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 7 Apr 2019 16:38:26 +0200
Subject: [PATCH] Fix build & minor cleanup

---
 src/Foundation.hs     |  7 ++-----
 src/Handler/Help.hs   | 11 +++++------
 templates/help.hamlet |  2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 0599f7b32..e689643da 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -2221,12 +2221,9 @@ instance YesodMail UniWorX where
   mailT ctx mail = defMailT ctx $ do
     void setMailObjectId
     setDateCurrent
-    replaceMailHeader "Sender" . Just . addressEmail =<< getsYesod (view _appMailFrom)
+    replaceMailHeader "Sender" . Just . addressEmail =<< getsYesod (appMailFrom . appSettings)
 
-    ret <- mail
-
-    setMailSmtpData
-    return ret
+    mail <* setMailSmtpData
 
 
 instance (MonadThrow m, MonadHandler m, HandlerSite m ~ UniWorX) => MonadCrypto m where
diff --git a/src/Handler/Help.hs b/src/Handler/Help.hs
index a1547b4c1..d29b7f214 100644
--- a/src/Handler/Help.hs
+++ b/src/Handler/Help.hs
@@ -48,11 +48,6 @@ postHelpR = do
   MsgRenderer mr <- getMsgRenderer
 
   ((res,formWidget),formEnctype) <- runFormPost $ renderAForm FormStandard $ helpForm mr mReferer mUid
-  let form = wrapForm formWidget def
-        { formAction = Just $ SomeRoute HelpR
-        , formEncoding = formEnctype
-        , formAttrs = [ ("data-ajax-submit", "") | isModal ]
-        }
 
   formResultModal res HelpR $ \HelpForm{..} -> do
     now <- liftIO getCurrentTime
@@ -68,4 +63,8 @@ postHelpR = do
 
   defaultLayout $ do
     setTitleI MsgHelpTitle
-    $(widgetFile "help")
+    wrapForm $(widgetFile "help") def
+      { formAction = Just $ SomeRoute HelpR
+      , formEncoding = formEnctype
+      , formAttrs = [ ("data-ajax-submit", "") | isModal ]
+      }
diff --git a/templates/help.hamlet b/templates/help.hamlet
index 4e1beb4cd..073bac477 100644
--- a/templates/help.hamlet
+++ b/templates/help.hamlet
@@ -1,3 +1,3 @@
 <p>
   _{MsgHelpIntroduction}
-^{form}
+^{formWidget}