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

git-svn-id: http://piwigo.org/svn/trunk@1272 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
chrisaga
2006-04-25 20:38:11 +00:00
parent 8455960acd
commit 2b9d9597f7
+2 -1
View File
@@ -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;
}