From 1aec31a16bf92b1055129ff0697509df0e7663b3 Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Mon, 8 Oct 2007 04:18:13 +0000 Subject: Bug 264785: config.rdf needs XML filtering of output to generate valid HTML (Template-Toolkit 2.15 and older do not escape all reserved characters correctly) - Patch by Frédéric Buclin r/a=mkanat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../en/default/admin/components/confirm-delete.html.tmpl | 2 +- .../en/default/admin/products/confirm-delete.html.tmpl | 2 +- template/en/default/bug/dependency-tree.html.tmpl | 4 ++-- template/en/default/config.rdf.tmpl | 16 ++++++++-------- template/en/default/list/list.ics.tmpl | 4 ++-- template/en/default/list/quips.html.tmpl | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) (limited to 'template/en') diff --git a/template/en/default/admin/components/confirm-delete.html.tmpl b/template/en/default/admin/components/confirm-delete.html.tmpl index bd48ff882..53bba1e35 100644 --- a/template/en/default/admin/components/confirm-delete.html.tmpl +++ b/template/en/default/admin/components/confirm-delete.html.tmpl @@ -74,7 +74,7 @@ from '[% product.name FILTER html %]' product Product Milestone URL: - + [% product.milestone_url FILTER html %] diff --git a/template/en/default/admin/products/confirm-delete.html.tmpl b/template/en/default/admin/products/confirm-delete.html.tmpl index 8a24cfd4e..7667d70e5 100644 --- a/template/en/default/admin/products/confirm-delete.html.tmpl +++ b/template/en/default/admin/products/confirm-delete.html.tmpl @@ -89,7 +89,7 @@ Milestone URL: [% IF product.milestone_url %] - + [%- product.milestone_url FILTER html %] [% ELSE %] diff --git a/template/en/default/bug/dependency-tree.html.tmpl b/template/en/default/bug/dependency-tree.html.tmpl index 6adb96aa6..5eb370838 100644 --- a/template/en/default/bug/dependency-tree.html.tmpl +++ b/template/en/default/bug/dependency-tree.html.tmpl @@ -143,10 +143,10 @@ [%+ bug.short_desc FILTER html %] [[% INCLUDE buginfo %]] - + title="See dependency tree for [% terms.bug %] [%+ bugid FILTER html %]"> [% END %] [% END %] diff --git a/template/en/default/config.rdf.tmpl b/template/en/default/config.rdf.tmpl index 4b5004992..99850fa71 100644 --- a/template/en/default/config.rdf.tmpl +++ b/template/en/default/config.rdf.tmpl @@ -117,13 +117,13 @@ [% FOREACH product = products %]
  • - + [% product.name FILTER html %] [% FOREACH component = product.components %] -
  • +
  • [% END %] @@ -131,7 +131,7 @@ [% FOREACH version = product.versions %] -
  • +
  • [% END %] @@ -140,7 +140,7 @@ [% FOREACH milestone = product.milestones %] -
  • +
  • [% END %] @@ -157,7 +157,7 @@ [% FOREACH product = products %] [% FOREACH component = product.components %]
  • - + [% component.name FILTER html %]
  • @@ -171,7 +171,7 @@ [% FOREACH product = products %] [% FOREACH version = product.versions %]
  • - + [% version.name FILTER html %]
  • @@ -186,7 +186,7 @@ [% FOREACH product = products %] [% FOREACH milestone = product.milestones %]
  • - + [% milestone.name FILTER html %]
  • @@ -201,7 +201,7 @@ [% PROCESS "global/field-descs.none.tmpl" %] [% FOREACH item = field %]
  • - + [% item.name FILTER html %] [% (field_descs.${item.name} OR item.description) FILTER html %] diff --git a/template/en/default/list/list.ics.tmpl b/template/en/default/list/list.ics.tmpl index 02444472a..f8953d996 100644 --- a/template/en/default/list/list.ics.tmpl +++ b/template/en/default/list/list.ics.tmpl @@ -57,11 +57,11 @@ END:VCALENDAR [% END %] [% BLOCK ics_uid %] - [% "${bug_id}@${base_url}" FILTER uri FILTER ics('UID') %] + [% "${bug_id}@${base_url}" FILTER url_quote FILTER ics('UID') %] [% END %] [% BLOCK ics_url %] - [% "${base_url}show_bug.cgi?id=${bug_id}" FILTER uri FILTER ics('URL;VALUE=URI') %] + [% "${base_url}show_bug.cgi?id=${bug_id}" FILTER url_quote FILTER ics('URL;VALUE=URI') %] [% END %] [% BLOCK ics_dtstart %] diff --git a/template/en/default/list/quips.html.tmpl b/template/en/default/list/quips.html.tmpl index e730e7cce..14cecb26e 100644 --- a/template/en/default/list/quips.html.tmpl +++ b/template/en/default/list/quips.html.tmpl @@ -119,13 +119,13 @@ [% "Unknown" IF NOT users.$userid %] - + Delete - -- cgit v1.2.3-24-g4f1b