Commits

Anonymous committed 4b947c5

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

Comments (0)

Files changed (1)

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
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.