From ec5418fbb47a049aaec4334f1a99de30d706fe17 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 2 Jan 2020 19:58:27 +0100
Subject: [PATCH] FIX: any global notice text can contain HTML (#8655)

---
 .../javascripts/discourse/components/global-notice.js.es6       | 2 +-
 .../discourse/templates/components/global-notice.hbs            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6
index 3f897d03ce9..20660b09859 100644
--- a/app/assets/javascripts/discourse/components/global-notice.js.es6
+++ b/app/assets/javascripts/discourse/components/global-notice.js.es6
@@ -130,7 +130,7 @@ export default Component.extend({
       ) {
         notices.push(
           Notice.create({
-            text: this.siteSettings.global_notice.htmlSafe(),
+            text: this.siteSettings.global_notice,
             id: "alert-global-notice"
           })
         );
diff --git a/app/assets/javascripts/discourse/templates/components/global-notice.hbs b/app/assets/javascripts/discourse/templates/components/global-notice.hbs
index 9f4ceba9504..c2b3b75e2e5 100644
--- a/app/assets/javascripts/discourse/templates/components/global-notice.hbs
+++ b/app/assets/javascripts/discourse/templates/components/global-notice.hbs
@@ -4,7 +4,7 @@
       {{#if notice.options.html}}
         {{{notice.options.html}}}
       {{/if}}
-      <span class="text">{{notice.text}}</span>
+      <span class="text">{{{notice.text}}}</span>
 
       {{#if notice.options.dismissable}}
         {{d-button