Patch for bug 256567: Harmonize descriptions of classifications and products in…

Patch for bug 256567: Harmonize descriptions of classifications and products in terms of 'FILTER html'; patch by Marc Schumann <wurblzap@gmail.com>; r=justdave, kiko, a=justdave.

Patch for bug 256567: Harmonize descriptions of classifications and products in…
1f6ed9be · jocuri%softhome.net · 74d1dd74 · 1f6ed9be · 1f6ed9be · 1f6ed9be
Commit 1f6ed9be authored Oct 07, 2004 by jocuri%softhome.net
6 changed files
--- a/template/en/default/admin/classifications/del.html.tmpl
+++ b/template/en/default/admin/classifications/del.html.tmpl
@@ -36,7 +36,7 @@
  <td valign="top">Description:</td>
  <td valign="top">
    [% IF description %]
-      [% description FILTER html %]
+      [% description %]
    [% ELSE %]
      <font color="red">description missing</font>
    [% END %]

--- a/template/en/default/admin/classifications/edit.html.tmpl
+++ b/template/en/default/admin/classifications/edit.html.tmpl
@@ -31,7 +31,7 @@
    </tr>
    <tr>
      <th align="right">Description:</th>
-      <td><textarea rows=4 cols=64 name="description">[% description FILTER html %]</textarea></TD>
+      <td><textarea rows=4 cols=64 name="description">[% description %]</textarea></TD>
    </tr>
    <tr valign=top>
      <th align="right"><a href="editproducts.cgi?classification=[% classification FILTER html %]">Edit products</a></th>

--- a/template/en/default/admin/classifications/reclassify.html.tmpl
+++ b/template/en/default/admin/classifications/reclassify.html.tmpl
@@ -35,7 +35,7 @@
      <td valign="top">Description:</td>
      <td valign="top" colspan=3>
        [% IF description %]
-          [% description FILTER html %]
+          [% description %]
        [% ELSE %]
          <font color="red">description missing</font>
        [% END %]

--- a/template/en/default/admin/classifications/select.html.tmpl
+++ b/template/en/default/admin/classifications/select.html.tmpl
@@ -38,7 +38,7 @@
      <td valign="top"><a href="editclassifications.cgi?action=edit&amp;classification=[% cl.classification FILTER html %]"><b>[% cl.classification FILTER html %]</b></a></td>
      <td valign="top"> 
      [% IF cl.description %]
-        [% cl.description FILTER html %]
+        [% cl.description %]
      [% ELSE %]
        <font color="red">none</font>
      [% END %]

--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -252,6 +252,10 @@
  'VERSION', 
 ],

+'global/choose-classification.html.tmpl' => [
+  'classdesc.$p', 
+],
+
 'global/choose-product.html.tmpl' => [
  'target',
  'proddesc.$p', 
@@ -495,6 +499,22 @@
  'c.content'
 ],

+'admin/classifications/del.html.tmpl' => [
+  'description', 
+],
+
+'admin/classifications/edit.html.tmpl' => [
+  'description', 
+],
+
+'admin/classifications/reclassify.html.tmpl' => [
+  'description', 
+],
+
+'admin/classifications/select.html.tmpl' => [
+  'cl.description', 
+],
+
 'admin/products/groupcontrol/confirm-edit.html.tmpl' => [
  'group.count', 
 ],

--- a/template/en/default/global/choose-classification.html.tmpl
+++ b/template/en/default/global/choose-classification.html.tmpl
@@ -54,7 +54,7 @@
    </th>

    [% IF classdesc.$p %]
-      <td valign="top">&nbsp;[% classdesc.$p FILTER html %]</td>
+      <td valign="top">&nbsp;[% classdesc.$p %]</td>
    [% END %]
  </tr>
  [% END %]