aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorchrisaga <chrisaga@piwigo.org>2006-04-25 19:49:00 +0000
committerchrisaga <chrisaga@piwigo.org>2006-04-25 19:49:00 +0000
commit8455960acdcbfcebebc508305faec98f72a592c4 (patch)
tree91f1891d113457e5b2e715e04fef4b4f937bbbf3 /include
parentbeab333d4a54ddf9ea64fa2e849124380b3d6c20 (diff)
- merge branch 1.6 r1268:1269 into trunk (bug 350)
git-svn-id: http://piwigo.org/svn/trunk@1270 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/category_subcats.inc.php2
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,
)
);
}