From b34a29663e693c68c1387e043994d533c601a12b Mon Sep 17 00:00:00 2001 From: Arthur Date: Wed, 3 Apr 2013 13:38:23 +1100 Subject: [PATCH] Corrected prev change --- cmsplugin_rt/button/templatetags/allow_special.py | 2 +- cmsplugin_rt/text_minimal_markup/templatetags/allow_special.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmsplugin_rt/button/templatetags/allow_special.py b/cmsplugin_rt/button/templatetags/allow_special.py index 1529054..6ea6305 100644 --- a/cmsplugin_rt/button/templatetags/allow_special.py +++ b/cmsplugin_rt/button/templatetags/allow_special.py @@ -26,7 +26,7 @@ def allow_special(text, autoescape=None): special = r'&#?[0-9a-z]{0,8};' pspecial = re.compile(special) #p = re.compile(r'(https?://www\.'+addr+'|www\.'+addr+'|mailto:[A-Za-z0-9\._@]+[A-Za-z0-9]|'+special+')') - p = re.compile(r'(https?://www\.'+addr+'|www\.'+addr+'|'+mailaddr+'|'+special+')') + p = re.compile(r'(https?://'+addr+'|www\.'+addr+'|'+mailaddr+'|'+special+')') result = "" for field in p.split(text): if phttp.match(field): diff --git a/cmsplugin_rt/text_minimal_markup/templatetags/allow_special.py b/cmsplugin_rt/text_minimal_markup/templatetags/allow_special.py index 1529054..6ea6305 100644 --- a/cmsplugin_rt/text_minimal_markup/templatetags/allow_special.py +++ b/cmsplugin_rt/text_minimal_markup/templatetags/allow_special.py @@ -26,7 +26,7 @@ def allow_special(text, autoescape=None): special = r'&#?[0-9a-z]{0,8};' pspecial = re.compile(special) #p = re.compile(r'(https?://www\.'+addr+'|www\.'+addr+'|mailto:[A-Za-z0-9\._@]+[A-Za-z0-9]|'+special+')') - p = re.compile(r'(https?://www\.'+addr+'|www\.'+addr+'|'+mailaddr+'|'+special+')') + p = re.compile(r'(https?://'+addr+'|www\.'+addr+'|'+mailaddr+'|'+special+')') result = "" for field in p.split(text): if phttp.match(field):