Merge branch 'hotfix/1.1a' into develop

This commit is contained in:
neersighted 2012-03-01 22:54:37 -08:00
commit 351e179f33

View file

@ -18,7 +18,7 @@ def parse(match):
except:
return "fail"
@hook.regex(r'([a-zA-Z]://|www\.)?[^ ]+(\.[a-z]+)+')
@hook.regex(r'(^[^\.])([a-zA-Z]://|www\.)?[^ ]+(\.[a-z]+)\/(.*)')
def urlparser(match, say=None):
url = urlnorm.normalize(match.group().encode('utf-8'))
if url[:7] != "http://":