From 1295f1c643c47ff92ef523e9c634d89005b5be6f Mon Sep 17 00:00:00 2001 From: Isaac van Bakel Date: Thu, 21 Apr 2022 14:32:49 +0100 Subject: [PATCH 1/2] Fix typo in how description meta tags are laid out --- yesod-core/src/Yesod/Core/Class/Yesod.hs | 2 +- yesod-core/test/YesodCoreTest/Meta.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yesod-core/src/Yesod/Core/Class/Yesod.hs b/yesod-core/src/Yesod/Core/Class/Yesod.hs index 3a3756c6..7a66aa81 100644 --- a/yesod-core/src/Yesod/Core/Class/Yesod.hs +++ b/yesod-core/src/Yesod/Core/Class/Yesod.hs @@ -88,7 +88,7 @@ class RenderRoute site => Yesod site where #{pageTitle p} $maybe description <- pageDescription p - <meta type="description" content="#{description}"> + <meta name="description" content="#{description}"> ^{pageHead p} <body> $forall (status, msg) <- msgs diff --git a/yesod-core/test/YesodCoreTest/Meta.hs b/yesod-core/test/YesodCoreTest/Meta.hs index 6bd9af28..03e6e8ac 100644 --- a/yesod-core/test/YesodCoreTest/Meta.hs +++ b/yesod-core/test/YesodCoreTest/Meta.hs @@ -48,7 +48,7 @@ metaTest = describe "Setting page metadata" $ do res <- request defaultRequest { pathInfo = ["desc"] } - assertBody "<!DOCTYPE html>\n<html><head><title>" res + assertBody "\n" res runner :: Session () -> IO () runner f = toWaiAppPlain App >>= runSession f From 032b906a73e6ce8f4d5eb15a856124d847ac99ae Mon Sep 17 00:00:00 2001 From: Isaac van Bakel Date: Thu, 21 Apr 2022 14:35:22 +0100 Subject: [PATCH 2/2] Bump version to 1.6.23.1, update ChangeLog --- yesod-core/ChangeLog.md | 4 ++++ yesod-core/yesod-core.cabal | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/yesod-core/ChangeLog.md b/yesod-core/ChangeLog.md index 926d3ba2..2c899b82 100644 --- a/yesod-core/ChangeLog.md +++ b/yesod-core/ChangeLog.md @@ -1,5 +1,9 @@ # ChangeLog for yesod-core +## 1.6.23.1 + +* Fix typo in creation of the description `` tag in `defaultLayout`. [#1766](https://github.com/yesodweb/yesod/pull/1766) + ## 1.6.23 * Add idempotent versions of `setDescription`, `setDescriptionI`. These functions diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index 651bcf1f..4c0fb52f 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -1,5 +1,5 @@ name: yesod-core -version: 1.6.23 +version: 1.6.23.1 license: MIT license-file: LICENSE author: Michael Snoyman