- merge branch 1.6 r1268:1269 into trunk (bug 350)

git-svn-id: http://piwigo.org/svn/trunk@1270 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 1 insertions, 1 deletions

diff --git a/include/category_subcats.inc.php b/include/category_subcats.inc.php
index 7c2f2bac0..02a2b214b 100644
--- a/include/category_subcats.inc.php
+++ b/include/category_subcats.inc.php
@@ -161,7 +161,7 @@ SELECT id, path, tn_ext
             ),
           'NAME' => htmlentities($category['name'],ENT_QUOTES),
           'CAPTION_NB_IMAGES' => (($category['nb_images'] == 0) ? '' : sprintf("%d ".l10n('pictures'), $category['nb_images'])),
-          'DESCRIPTION' => htmlentities(@$category['comment'],ENT_QUOTES),
+          'DESCRIPTION' => @$category['comment'],ENT_QUOTES,
           )
         );
     }