Skip to content

Commit

Permalink
[1.0.X] Fixed #10675 -- Added unicode paragraph and line-sep handling…
Browse files Browse the repository at this point in the history
… to escapejs.

There were a couple of line breaking Unicode characters (\u2028 and
\u2029) that cause Javascript errors, at least in Firefox, if not
escaped. So now we do so. Based on a patch from rleland.

Backport of r10543 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10544 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
malcolmt committed Apr 12, 2009
1 parent a83e4cb commit f0c9bc5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
4 changes: 3 additions & 1 deletion django/template/defaultfilters.py
Expand Up @@ -76,7 +76,9 @@ def capfirst(value):
('&', r'\x26'),
('=', r'\x3D'),
('-', r'\x2D'),
(';', r'\x3B')
(';', r'\x3B'),
(u'\u2028', r'\u2028'),
(u'\u2029', r'\u2029')
)

# Escape every ASCII character with a value less than 32.
Expand Down
3 changes: 3 additions & 0 deletions tests/regressiontests/defaultfilters/tests.py
Expand Up @@ -83,6 +83,9 @@
>>> escapejs(ur'<script>and this</script>')
u'\\x3Cscript\\x3Eand this\\x3C/script\\x3E'
>>> escapejs(u'paragraph separator:\u2029and line separator:\u2028')
u'paragraph separator:\\u2029and line separator:\\u2028'
>>> fix_ampersands(u'Jack & Jill & Jeroboam')
u'Jack &amp; Jill &amp; Jeroboam'
Expand Down

0 comments on commit f0c9bc5

Please sign in to comment.