github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-27 15:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes bug #104: do not double escape & in markdown urls; http://code.reddit.com/ticket/104

Browse Source
This commit is contained in:
Jeremy Edberg
2008-09-03 14:25:42 -07:00
parent 566469981d
commit 1e9a3aaa62
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
r2/r2/lib/filters.py
View File

@@ -96,6 +96,7 @@ r_url = re.compile('(?<![\(\[])(http://[^\s\'\"\]\)]+)')
jscript_url = re.compile('<a href="(?!http|ftp|mailto|/).*</a>', re.I | re.S)
href_re = re.compile('<a href="([^"]+)"', re.I | re.S)
code_re = re.compile('<code>([^<]+)</code>')
a_re = re.compile('>([^<]+)</a>')
#TODO markdown should be looked up in batch?
@@ -122,9 +123,14 @@ def safemarkdown(text):
def code_handler(m):
l = m.group(1)
return '<code>%s</code>' % l.replace('&amp;','&')
#unescape double escaping in links
def inner_a_handler(m):
l = m.group(1)
return '>%s</a>' % l.replace('&amp;','&')
# remove the "&" escaping in urls
text = href_re.sub(href_handler, text)
text = code_re.sub(code_handler, text)
text = a_re.sub(inner_a_handler, text)
return MD_START + text + MD_END