- merge branch 1.6 r1270:1271 into trunk (bug 351)

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

1 files changed, 2 insertions, 1 deletions

diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index 21784654b..00acd0018 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -479,6 +479,7 @@ function get_html_menu_category($categories)
  */
 function parse_comment_content($content)
 {
+  htmlentities($content,ENT_QUOTES);
   $pattern = '/(https?:\/\/\S*)/';
   $replacement = '<a href="$1" rel="nofollow">$1</a>';
   $content = preg_replace($pattern, $replacement, $content);
@@ -500,7 +501,7 @@ function parse_comment_content($content)
   $replacement = '<span style="font-style:italic;">$1$2</span>';
   $content = preg_replace($pattern, $replacement, $content);
 
-  $content = '<div>'.htmlentities($content,ENT_QUOTES).'</div>';
+  $content = '<div>'.$content.'</div>';
   return $content;
 }