Permalink
Browse files

Fixed #9883: no longer do strange things with whitespace in the lineb…

…reaks filter. Thanks, keithb.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10225 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 02e5653 commit c8ad87c2dcae02dee537dd51b4661c6411163453 @jacobian jacobian committed Mar 30, 2009
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)

0 comments on commit c8ad87c

Please sign in to comment.