Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.0.X] Fixed #9883: no longer do strange things with whitespace in t…

…he linebreaks filter. Thanks, keithb.

Backport of r10225 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10292 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 09953968172935ac5665cf75f0de87961d1741fe 1 parent 7475092
@jacobian jacobian authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 django/utils/html.py
View
4 django/utils/html.py
@@ -46,9 +46,9 @@ def linebreaks(value, autoescape=False):
value = re.sub(r'\r\n|\r|\n', '\n', force_unicode(value)) # normalize newlines
paras = re.split('\n{2,}', value)
if autoescape:
- paras = [u'<p>%s</p>' % escape(p.strip()).replace('\n', '<br />') for p in paras]
+ paras = [u'<p>%s</p>' % escape(p).replace('\n', '<br />') for p in paras]
else:
- paras = [u'<p>%s</p>' % p.strip().replace('\n', '<br />') for p in paras]
+ paras = [u'<p>%s</p>' % p.replace('\n', '<br />') for p in paras]
return u'\n\n'.join(paras)
linebreaks = allow_lazy(linebreaks, unicode)
Please sign in to comment.
Something went wrong with that request. Please try again.