github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-16 01:21:21 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: any global notice text can contain HTML (#8655)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2020-01-02 19:58:27 +01:00
committed by GitHub
parent 98853b217f
commit ec5418fbb4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/global-notice.js.es6
View File

@ -130,7 +130,7 @@ export default Component.extend({
) { ) {
notices.push( notices.push(
Notice.create({ Notice.create({
text: this.siteSettings.global_notice.htmlSafe(), text: this.siteSettings.global_notice,
id: "alert-global-notice" id: "alert-global-notice"
}) })
); );

2
app/assets/javascripts/discourse/templates/components/global-notice.hbs
View File

@ -4,7 +4,7 @@
{{#if notice.options.html}} {{#if notice.options.html}}
{{{notice.options.html}}} {{{notice.options.html}}}
{{/if}} {{/if}}
<span class="text">{{notice.text}}</span> <span class="text">{{{notice.text}}}</span>
{{#if notice.options.dismissable}} {{#if notice.options.dismissable}}
{{d-button {{d-button