diff options
| author | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-03-31 21:40:40 +0000 |
|---|---|---|
| committer | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-03-31 21:40:40 +0000 |
| commit | 09953968172935ac5665cf75f0de87961d1741fe (patch) | |
| tree | a9c5fb41426699954a1fdccfdbaccdb6de294f19 | |
| parent | 7475092c9facfdec98c6c01a7edbdaed53e4a07a (diff) | |
[1.0.X] Fixed #9883: no longer do strange things with whitespace in the 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
| -rw-r--r-- | django/utils/html.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/utils/html.py b/django/utils/html.py index 9b3fad8b03..c985538041 100644 --- a/django/utils/html.py +++ b/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) |