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.68 -r1.69 --- openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl 7 Aug 2017 23:48:00 -0000 1.68 +++ openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl 30 Sep 2017 18:12:52 -0000 1.69 @@ -2281,7 +2281,7 @@ if { $html_p == "t" } { return $raw_string } else { - return [ad_text_to_html $raw_string] + return [ad_text_to_html -- $raw_string] } } Index: openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl 7 Aug 2017 23:48:00 -0000 1.11 +++ openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl 30 Sep 2017 18:12:52 -0000 1.12 @@ -14,7 +14,7 @@ set html "Some bold test" - set result [ad_html_to_text $html] + set result [ad_html_to_text -- $html] aa_true "contains asterisks?" [regexp {\*bold\*} $result] @@ -38,7 +38,7 @@

following text }} { - set result [ad_html_to_text $html] + set result [ad_html_to_text -- $html] # make sure the desired text is in there and _before_ the # footnotes Index: openacs-4/packages/assessment/lib/section-items.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/section-items.adp,v diff -u -r1.25 -r1.26 --- openacs-4/packages/assessment/lib/section-items.adp 16 Apr 2009 13:44:34 -0000 1.25 +++ openacs-4/packages/assessment/lib/section-items.adp 30 Sep 2017 18:12:52 -0000 1.26 @@ -51,7 +51,7 @@

(#assessment.max_time# @items.max_time_to_complete@) (@items.points@ #assessment.points#) - + #assessment.add_trigger# (@items.checks_related@) Index: openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl,v diff -u -r1.23 -r1.24 --- openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl 7 Aug 2017 23:48:04 -0000 1.23 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl 30 Sep 2017 18:12:52 -0000 1.24 @@ -95,7 +95,7 @@ set folder_id [as::assessment::folder_id -package_id $package_id] set choice_sets [list [list "--" ""]] db_foreach existing_choice_sets {} { - set set_title [string trim [regsub {\[.*?\]} [ad_html_to_text $title] {}]] + set set_title [string trim [regsub {\[.*?\]} [ad_html_to_text -- $title] {}]] lappend choice_sets [list [expr {$set_title eq "" ? $section_title : $set_title}] $revision_id] } if {[llength $choice_sets]} { Index: openacs-4/packages/bug-tracker/lib/nav-bar.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/lib/nav-bar.adp,v diff -u -r1.8 -r1.9 --- openacs-4/packages/bug-tracker/lib/nav-bar.adp 12 Sep 2016 11:29:11 -0000 1.8 +++ openacs-4/packages/bug-tracker/lib/nav-bar.adp 30 Sep 2017 18:12:52 -0000 1.9 @@ -5,7 +5,7 @@ - +

Index: openacs-4/packages/bug-tracker/lib/version-bar.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/lib/version-bar.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/bug-tracker/lib/version-bar.adp 29 Mar 2004 15:07:33 -0000 1.4 +++ openacs-4/packages/bug-tracker/lib/version-bar.adp 30 Sep 2017 18:12:52 -0000 1.5 @@ -1,4 +1,4 @@ - +
Index: openacs-4/packages/bug-tracker/www/bug.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/bug.adp,v diff -u -r1.18 -r1.19 --- openacs-4/packages/bug-tracker/www/bug.adp 3 Jul 2015 11:19:06 -0000 1.18 +++ openacs-4/packages/bug-tracker/www/bug.adp 30 Sep 2017 18:12:52 -0000 1.19 @@ -17,7 +17,7 @@
- + (#bug-tracker.show_user_agent#) Index: openacs-4/packages/bug-tracker/www/no-bugs.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/no-bugs.adp,v diff -u -r1.10 -r1.11 --- openacs-4/packages/bug-tracker/www/no-bugs.adp 3 Jul 2015 11:19:06 -0000 1.10 +++ openacs-4/packages/bug-tracker/www/no-bugs.adp 30 Sep 2017 18:12:52 -0000 1.11 @@ -6,7 +6,7 @@ #bug-tracker.This_project_is_empty#

- +

» #bug-tracker.Project_administration#

Index: openacs-4/packages/bug-tracker/www/no-components.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/no-components.adp,v diff -u -r1.9 -r1.10 --- openacs-4/packages/bug-tracker/www/no-components.adp 3 Jul 2015 11:19:06 -0000 1.9 +++ openacs-4/packages/bug-tracker/www/no-components.adp 30 Sep 2017 18:12:52 -0000 1.10 @@ -6,7 +6,7 @@

- + #bug-tracker.Please_visit_admin_page# Index: openacs-4/packages/bug-tracker/www/notifications.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/notifications.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/bug-tracker/www/notifications.adp 3 Jul 2015 11:19:06 -0000 1.7 +++ openacs-4/packages/bug-tracker/www/notifications.adp 30 Sep 2017 18:12:52 -0000 1.8 @@ -16,7 +16,7 @@ - + » @@ -27,12 +27,12 @@ @notifications.label@ - + #bug-tracker.Subscribe# - + #bug-tracker.Unsubscribe# Index: openacs-4/packages/bug-tracker/www/related-file-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/related-file-add.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/bug-tracker/www/related-file-add.tcl 29 May 2016 10:50:02 -0000 1.3 +++ openacs-4/packages/bug-tracker/www/related-file-add.tcl 30 Sep 2017 18:12:52 -0000 1.4 @@ -65,7 +65,7 @@ -upload_file $upload_file] # prevent cross-site scripting - set description [ad_html_to_text -showtags -no_format $description] + set description [ad_html_to_text -showtags -no_format -- $description] db_dml update_revision_description {} set target_object_id [content::revision::item_id -revision_id $revision_id] Index: openacs-4/packages/bug-tracker/www/related-file-update.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/related-file-update.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/bug-tracker/www/related-file-update.tcl 29 May 2016 10:50:02 -0000 1.4 +++ openacs-4/packages/bug-tracker/www/related-file-update.tcl 30 Sep 2017 18:12:52 -0000 1.5 @@ -67,7 +67,7 @@ set old_filename [content::item::get_title -item_id $related_object_id -is_live t] # prevent cross-site scripting - set description [ad_html_to_text -showtags -no_format $description] + set description [ad_html_to_text -showtags -no_format -- $description] content::revision::new \ -item_id $related_object_id \ Index: openacs-4/packages/bug-tracker/www/admin/categories.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/categories.adp,v diff -u -r1.8 -r1.9 --- openacs-4/packages/bug-tracker/www/admin/categories.adp 3 Jul 2015 11:19:07 -0000 1.8 +++ openacs-4/packages/bug-tracker/www/admin/categories.adp 30 Sep 2017 18:12:52 -0000 1.9 @@ -52,9 +52,9 @@   - + @categories.child_heading@ - + @@ -65,7 +65,7 @@ - * + * #bug-tracker.set# Index: openacs-4/packages/bug-tracker/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/index.adp,v diff -u -r1.13 -r1.14 --- openacs-4/packages/bug-tracker/www/admin/index.adp 3 Jul 2015 11:19:07 -0000 1.13 +++ openacs-4/packages/bug-tracker/www/admin/index.adp 30 Sep 2017 18:12:52 -0000 1.14 @@ -4,7 +4,7 @@

- +

#bug-tracker.This_is_a_new_project# @@ -58,7 +58,7 @@ - + #bug-tracker.Versions# Index: openacs-4/packages/dotlrn/www/spam-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-2.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/dotlrn/www/spam-2.tcl 7 Aug 2017 23:48:09 -0000 1.11 +++ openacs-4/packages/dotlrn/www/spam-2.tcl 30 Sep 2017 18:12:52 -0000 1.12 @@ -36,7 +36,7 @@ if {$format eq "html"} { set preview_message "$message" } elseif {$format eq "pre"} { - set preview_message [ad_text_to_html $message] + set preview_message [ad_text_to_html -- $message] } else { set preview_message [ns_quotehtml $message] } Index: openacs-4/packages/dotlrn/www/spam.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.tcl,v diff -u -r1.32 -r1.33 --- openacs-4/packages/dotlrn/www/spam.tcl 7 Aug 2017 23:48:09 -0000 1.32 +++ openacs-4/packages/dotlrn/www/spam.tcl 30 Sep 2017 18:12:52 -0000 1.33 @@ -205,7 +205,7 @@ set message "$message" set message_type "html" } elseif {$format eq "pre"} { - set message [ad_text_to_html $message] + set message [ad_text_to_html -- $message] set message_type "html" } else { set message [ns_quotehtml $message] Index: openacs-4/packages/schema-browser/tcl/schema-browser-procs-oracle.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/schema-browser/tcl/schema-browser-procs-oracle.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/schema-browser/tcl/schema-browser-procs-oracle.tcl 27 Jun 2015 20:15:21 -0000 1.4 +++ openacs-4/packages/schema-browser/tcl/schema-browser-procs-oracle.tcl 30 Sep 2017 18:12:52 -0000 1.5 @@ -367,10 +367,10 @@ } append html "\t[string tolower [ns_set get $column "column_name"]]\t [ns_set get $column "data_type"]([ns_set get $column "data_length"])" if { [ns_set get $column "data_default"] != "" } { - append html " DEFAULT [ad_text_to_html [ns_set get $column "data_default"]]" + append html " DEFAULT [ad_text_to_html -- [ns_set get $column data_default]]" } if { [ns_set get $column "nullable"] != "" } { - append html " [ns_set get $column "nullable"]" + append html " [ns_set get $column nullable]" } set constraint_list [ns_set get $column "constraint_list"] foreach constraint $constraint_list { Index: openacs-4/packages/schema-browser/tcl/schema-browser-procs-postgresql.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/schema-browser/tcl/schema-browser-procs-postgresql.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/schema-browser/tcl/schema-browser-procs-postgresql.tcl 27 Jun 2015 20:15:21 -0000 1.12 +++ openacs-4/packages/schema-browser/tcl/schema-browser-procs-postgresql.tcl 30 Sep 2017 18:12:52 -0000 1.13 @@ -496,10 +496,10 @@ append html " PRIMARY KEY" } if { [ns_set get $column "data_default"] != "" } { - append html " DEFAULT [ad_text_to_html [ns_set get $column "data_default"]]" + append html " DEFAULT [ad_text_to_html -- [ns_set get $column data_default]]" } if { [ns_set get $column "nullable"] != "" } { - append html " [ns_set get $column "nullable"]" + append html " [ns_set get $column nullable]" } if { [info exists references([ns_set get $column column_name])] } { Index: openacs-4/packages/schema-browser/www/trigger.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/schema-browser/www/trigger.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/schema-browser/www/trigger.tcl 16 Sep 2013 09:54:29 -0000 1.4 +++ openacs-4/packages/schema-browser/www/trigger.tcl 30 Sep 2017 18:12:52 -0000 1.5 @@ -39,11 +39,11 @@ create or replace trigger [string tolower $trigger_name] $triggering_event $trigger_type
-[ad_text_to_html $trigger_body] +[ad_text_to_html -- $trigger_body] [ad_footer] " -doc_return 200 text/html $html \ No newline at end of file +doc_return 200 text/html $html Index: openacs-4/packages/survey/www/one-respondent.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/one-respondent.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/packages/survey/www/one-respondent.tcl 7 Aug 2017 23:48:29 -0000 1.10 +++ openacs-4/packages/survey/www/one-respondent.tcl 30 Sep 2017 18:12:52 -0000 1.11 @@ -42,7 +42,7 @@ set context [_ survey.Responses] if {$description_html_p != "t" } { - set description [ad_text_to_html $description] + set description [ad_text_to_html -- $description] } db_multirow -extend {answer_summary pretty_submission_date respond_url} responses responses_select {} { Index: openacs-4/packages/survey/www/respond.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/respond.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/survey/www/respond.tcl 7 Aug 2017 23:48:29 -0000 1.11 +++ openacs-4/packages/survey/www/respond.tcl 30 Sep 2017 18:12:52 -0000 1.12 @@ -36,7 +36,7 @@ set display_type $survey_info(display_type) if {$description_html_p != "t"} { - set description [ad_text_to_html $description] + set description [ad_text_to_html -- $description] } if {($single_response_p=="t" && $editable_p=="f" && $number_of_responses>0) || ($single_response_p=="t" && $editable_p=="t" && $number_of_responses>0 && $response_id==0)} { Index: openacs-4/packages/survey/www/admin/one-respondent.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/one-respondent.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/survey/www/admin/one-respondent.tcl 27 Oct 2014 16:41:56 -0000 1.7 +++ openacs-4/packages/survey/www/admin/one-respondent.tcl 30 Sep 2017 18:12:53 -0000 1.8 @@ -25,7 +25,7 @@ if {$description_html_p != "t"} { - set description [ad_text_to_html $description] + set description [ad_text_to_html -- $description] } # survey_name and description are now set Index: openacs-4/packages/survey/www/admin/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/one.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/survey/www/admin/one.tcl 27 Jun 2015 20:46:15 -0000 1.12 +++ openacs-4/packages/survey/www/admin/one.tcl 30 Sep 2017 18:12:53 -0000 1.13 @@ -27,7 +27,7 @@ } if {$survey_info(description_html_p) == "f"} { - set survey_info(description) [ad_text_to_html $survey_info(description)] + set survey_info(description) [ad_text_to_html -- $survey_info(description)] } # get users and # who responded etc... Index: openacs-4/packages/survey/www/admin/survey-create-confirm.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/survey-create-confirm.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/survey/www/admin/survey-create-confirm.tcl 7 Aug 2017 23:48:29 -0000 1.4 +++ openacs-4/packages/survey/www/admin/survey-create-confirm.tcl 30 Sep 2017 18:12:53 -0000 1.5 @@ -1,5 +1,5 @@ if {$desc_html eq "pre"} { - set description [ad_text_to_html $description] + set description [ad_text_to_html -- $description] } elseif {$desc_html eq "plain"} { set description [ns_quotehtml $description] } Index: openacs-4/packages/survey/www/admin/survey-preview.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/survey-preview.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/survey/www/admin/survey-preview.tcl 7 Aug 2017 23:48:29 -0000 1.8 +++ openacs-4/packages/survey/www/admin/survey-preview.tcl 30 Sep 2017 18:12:53 -0000 1.9 @@ -43,7 +43,7 @@ set display_type $survey_info(display_type) if {$description_html_p != "t"} { - set description [ad_text_to_html $description] + set description [ad_text_to_html -- $description] } Index: openacs-4/packages/webmail-system/tcl/webmail-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail-system/tcl/webmail-procs.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/webmail-system/tcl/webmail-procs.tcl 2 Dec 2013 09:05:28 -0000 1.3 +++ openacs-4/packages/webmail-system/tcl/webmail-procs.tcl 30 Sep 2017 18:12:53 -0000 1.4 @@ -342,7 +342,7 @@ } 2 { # Enhanced Text - return [ad_text_to_html [ad_html_to_text $body]] + return [ad_text_to_html [ad_html_to_text -- $body]] } 3 { # Plain Text @@ -812,4 +812,4 @@ } -# ------------------------- END OF FILE ------------------------- # \ No newline at end of file +# ------------------------- END OF FILE ------------------------- # Index: openacs-4/packages/webmail-system/www/accounts.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail-system/www/accounts.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/webmail-system/www/accounts.tcl 6 Jun 2006 14:35:11 -0000 1.1 +++ openacs-4/packages/webmail-system/www/accounts.tcl 30 Sep 2017 18:12:53 -0000 1.2 @@ -70,7 +70,7 @@ label "[_ webmail-system.Active]" html "align center" display_template { - + @@ -83,7 +83,7 @@ } delete { label "" display_template { - + Index: openacs-4/packages/webmail-system/www/compose.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail-system/www/compose.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/webmail-system/www/compose.tcl 6 Jun 2006 14:35:10 -0000 1.1 +++ openacs-4/packages/webmail-system/www/compose.tcl 30 Sep 2017 18:12:53 -0000 1.2 @@ -132,7 +132,7 @@ set body "\n\n\n\n---------------[_ webmail-system.Original_Message]---------------\n\n" append body "[_ webmail-system.To] $sender\n[_ webmail-system.From] $recipient\n[_ webmail-system.Subject] $subject\n\n" - append body $[ad_html_to_text $content] + append body $[ad_html_to_text -- $content] append body "\n\n-------------[_ webmail-system.End_Original_Message]-------------\n" set subject "$prefix$subject" Index: openacs-4/packages/webmail-system/www/mail-reply.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail-system/www/mail-reply.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/webmail-system/www/mail-reply.tcl 6 Jun 2006 14:35:10 -0000 1.1 +++ openacs-4/packages/webmail-system/www/mail-reply.tcl 30 Sep 2017 18:12:53 -0000 1.2 @@ -57,7 +57,7 @@ set body "\n\n\n\n---------------[_ webmail-system.Original_Message]---------------\n\n" append body "[_ webmail-system.To] $sender\n[_ webmail-system.From] $recipient\n[_ webmail-system.Subject] $subject\n\n" -append body $[ad_html_to_text $content] +append body $[ad_html_to_text -- $content] append body "\n\n-------------[_ webmail-system.End_Original_Message]-------------\n" append prefix $subject Index: openacs-4/packages/webmail-system/www/not-logged-in.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail-system/www/not-logged-in.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/webmail-system/www/not-logged-in.adp 6 Jun 2006 14:35:10 -0000 1.1 +++ openacs-4/packages/webmail-system/www/not-logged-in.adp 30 Sep 2017 18:12:53 -0000 1.2 @@ -23,5 +23,5 @@

#webmail-system.Login# -#webmail-system.Accounts# +#webmail-system.Accounts#

Index: openacs-4/packages/webmail-system/www/preferences.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail-system/www/preferences.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/webmail-system/www/preferences.adp 6 Jun 2006 14:35:10 -0000 1.1 +++ openacs-4/packages/webmail-system/www/preferences.adp 30 Sep 2017 18:12:53 -0000 1.2 @@ -11,7 +11,7 @@ @page_title@ - + Index: openacs-4/packages/webmail-system/www/admin/servers.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail-system/www/admin/servers.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/webmail-system/www/admin/servers.tcl 6 Jun 2006 14:35:11 -0000 1.1 +++ openacs-4/packages/webmail-system/www/admin/servers.tcl 30 Sep 2017 18:12:53 -0000 1.2 @@ -72,7 +72,7 @@ html "align left" display_template { @servers.smtp_addr@:@servers.smtp_port@ - + @@ -87,7 +87,7 @@ label "[_ webmail-system.Active]" html "align right" display_template { - + Index: openacs-4/packages/webmail-system/www/admin/users.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail-system/www/admin/users.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/webmail-system/www/admin/users.tcl 6 Jun 2006 14:35:11 -0000 1.1 +++ openacs-4/packages/webmail-system/www/admin/users.tcl 30 Sep 2017 18:12:53 -0000 1.2 @@ -62,7 +62,7 @@ label "[_ webmail-system.Active]" html "align right" display_template { - + Index: openacs-4/packages/xowiki/tcl/link-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/link-procs.tcl,v diff -u -r1.97 -r1.98 --- openacs-4/packages/xowiki/tcl/link-procs.tcl 7 Aug 2017 23:48:30 -0000 1.97 +++ openacs-4/packages/xowiki/tcl/link-procs.tcl 30 Sep 2017 18:12:53 -0000 1.98 @@ -423,7 +423,7 @@ set object_type ::xowiki::File set link [$package_id make_link $package_id edit-new object_type \ [list parent_id [my parent_id]] \ - [list title [ad_html_to_text -no_format $label]] \ + [list title [ad_html_to_text -no_format -- $label]] \ [list return_url [::xo::cc url]] \ autoname name last_page_id] set html [my render_not_found $link $label] Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v diff -u -r1.492 -r1.493 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 7 Sep 2017 17:21:52 -0000 1.492 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 30 Sep 2017 18:12:53 -0000 1.493 @@ -514,7 +514,7 @@ # Page proc quoted_html_content text { - list [ad_text_to_html $text] text/html + list [ad_text_to_html -- $text] text/html } # Index: openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl,v diff -u -r1.40 -r1.41 --- openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl 7 Aug 2017 23:48:31 -0000 1.40 +++ openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl 30 Sep 2017 18:12:53 -0000 1.41 @@ -40,7 +40,7 @@ text/html { set content [dict get $d html] set text [ad_html_text_convert -from text/html -to text/plain -- [dict get $d html]] - #set text [ad_text_to_html [dict get $d html]]; #this could be used for entity encoded html text in rss entries + #set text [ad_text_to_html -- [dict get $d html]]; #this could be used for entity encoded html text in rss entries # If the html contains links (which are rendered by ad_html_text as [1], [2], ...) # then we have to use CDATA in the description Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v diff -u -r1.331 -r1.332 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 7 Sep 2017 14:24:12 -0000 1.331 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 30 Sep 2017 18:12:53 -0000 1.332 @@ -172,7 +172,7 @@ if {[my exists_form_parameter $key]} { set __value [my form_parameter $key] if {$key in $text_to_html} { - set __value [ad_text_to_html $__value] + set __value [ad_text_to_html -- $__value] } lappend default_variables [string range $key 1 end] $__value switch $key {
@card_name@@card_type@
@card_content@