Skip to content

Commit

Permalink
Merge pull request mozilla#3514 from pmclanahan/newsletter-l10n-strin…
Browse files Browse the repository at this point in the history
…g-escape-1221632

Fix bug 1221632: Disable auto-escape for newsletter titles and descriptions
  • Loading branch information
pmac committed Nov 5, 2015
2 parents 4c50297 + a4d26c2 commit 60fd771
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions bedrock/newsletter/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
import basket
import basket.errors
import commonware.log
from jinja2 import Markup

import lib.l10n_utils as l10n_utils
import requests
from lib.l10n_utils.dotlang import _, _lazy
Expand Down Expand Up @@ -324,11 +326,11 @@ def existing(request, token=None):
description = _(data['description'])

form_data = {
'title': title,
'title': Markup(title),
'subscribed_radio': newsletter in user['newsletters'],
'subscribed_check': newsletter in user['newsletters'],
'newsletter': newsletter,
'description': description,
'description': Markup(description),
'english_only': len(langs) == 1 and langs[0].startswith('en'),
}
if 'order' in data:
Expand Down

0 comments on commit 60fd771

Please sign in to comment.