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

diff --git a/template/en/default/admin/classifications/del.html.tmpl b/template/en/default/admin/classifications/del.html.tmpl
index 0089715620be80b3188b7c3d6cc93c53ba726f22..1430e093d0f7f0aac8a4e57d5658c9a5a134aa12 100644 (file)
--- 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 %]

diff --git a/template/en/default/admin/classifications/edit.html.tmpl b/template/en/default/admin/classifications/edit.html.tmpl
index ebc16e82e8eb867cff7df1b4b549ef1addc9e61a..6c58836d75faebe30e84f76070631b17f8fd315c 100644 (file)
--- 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>

diff --git a/template/en/default/admin/classifications/reclassify.html.tmpl b/template/en/default/admin/classifications/reclassify.html.tmpl
index d860f67cf75b091e25766a65f64b1e5c83dd0612..5d4cb73e4a1bda9a98210fff1261d6090806018f 100644 (file)
--- 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 %]

diff --git a/template/en/default/admin/classifications/select.html.tmpl b/template/en/default/admin/classifications/select.html.tmpl
index 5908375d214e6c09bf85e59f806c84735805b117..0c0d3d392a8fd8b945defc641646c52433667ad1 100644 (file)
--- 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 %]

diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 7f8ea18a7f871b1238d75dbfbbc6d217726511bf..f0267a6065a4d06d45226ee2c02a48ec70589aa0 100644 (file)
--- 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', 
 ],

diff --git a/template/en/default/global/choose-classification.html.tmpl b/template/en/default/global/choose-classification.html.tmpl
index b7b8fb66e522585d012ce60c629be0fb19aa8a0e..1d52b3686db36e8bdbe7049fb12d29600cd93072 100644 (file)
--- 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 %]