aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchrisaga <chrisaga@piwigo.org>2006-04-25 20:38:11 +0000
committerchrisaga <chrisaga@piwigo.org>2006-04-25 20:38:11 +0000
commit2b9d9597f788c759dce863acf8a12b123452a5e3 (patch)
tree9363c389994882b2cff40eff56ac72ddcfdd59fd
parent8455960acdcbfcebebc508305faec98f72a592c4 (diff)
- merge branch 1.6 r1270:1271 into trunk (bug 351)
git-svn-id: http://piwigo.org/svn/trunk@1272 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/functions_html.inc.php3
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;
}