Commits

pjenvey  committed 4b947c5

[svn] Fixed simple_format to deal with multiple single returns within
a single paragraph (Sync'd to 4994)

  • Participants
  • Parent commits 3d873bb

Comments (0)

Files changed (1)

File webhelpers/rails/text.py

 """
 Text Helpers
 """
-# Last synced with Rails copy at Revision 4916 on Sep 4th, 2006.
+# Last synced with Rails copy at Revision 4994 on Sep 6th, 2006.
 # Purposely left out sanitize and strip_tags, should be included at some point likely using
 # BeautifulSoup.
 
     text = re.sub(r'(\r\n|\n|\r)', r'\n', text)
     text = re.sub(r'\n\n+', r'\n\n', text)
     text = re.sub(r'(\n\n)', r'</p>\1<p>', text)
-    text = re.sub(r'([^\n])(\n)([^\n])', r'\1\2<br />\3', text)
+    text = re.sub(r'([^\n])(\n)(?=[^\n])', r'\1\2<br />', text)
     text = content_tag("p", text).replace('</p><p></p>', '</p>')
     text = re.sub(r'</p><p>', r'</p>\n<p>', text)
     return text