Index: openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl,v
diff -u -r1.101 -r1.102
--- openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl 21 Sep 2018 14:11:55 -0000 1.101
+++ openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl 14 Oct 2018 17:55:37 -0000 1.102
@@ -39,6 +39,7 @@
if { $text eq "" } {
return ""
}
+ set orig_text $text
set space_added 0
set nr_links 0
@@ -76,7 +77,7 @@
# where we do not want turn the @ into a mailto.
incr nr_links [regsub -nocase -all \
- {([^a-zA-Z0-9=/.]+)(mailto:)?([^=\(\)\s:;,@<>/]+@[^\(\)\s.:;,@<>]+[.][^\(\)\s:;,@<>]+)} $text \
+ {([^a-zA-Z0-9=/.-]+)(mailto:)?([^=\(\)\s:;,@<>/]+@[^\(\)\s.:;,@<>]+[.][^\(\)\s:;,@<>]+)} $text \
"\\1\u0002mailto:\\3\u0003" text]
#
@@ -158,7 +159,7 @@
# to debug.
#
if {$changed_back > 0} {
- ad_log warning "Replaced spurious magic marker in ad_text_to_html"
+ ad_log warning "Replaced spurious magic marker in ad_text_to_html, orig:\n$orig_text"
}
}
}