- merge trunk r1289:1290 into branch 1.6 (bug 358 fixed)

git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1291 68402e56-0260-453c-a942-63ccdbb3a9ee

include/functions_html.inc.php

@@ -450,7 +450,7 @@ function get_html_menu_category($categories)
     {
       $menu.= ' rel="up"';
     }
-    $menu.= '>'.htmlentities($category['name'],ENT_QUOTES).'</a>';
+    $menu.= '>'.$category['name'].'</a>';
 
     if ($category['nb_images'] > 0)
     {
@@ -550,7 +550,7 @@ function get_html_tag_selection(
 
     $output.=
       ' />'
-      .' '. htmlentities($tag['name'],ENT_QUOTES)
+      .' '. $tag['name']
       .'</label>'
       .'</li>'
       ."\n"