mirror of
https://github.com/Piwigo/Piwigo.git
synced 2025-04-27 19:59:56 +03:00
merge branch 1.5 into trunk r1001:1002: bug 259 fixed
git-svn-id: http://piwigo.org/svn/trunk@1030 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
parent
0e78db47de
commit
c8e9793412
1 changed files with 11 additions and 7 deletions
|
@ -409,21 +409,25 @@ function get_html_menu_category($categories)
|
|||
function parse_comment_content($content)
|
||||
{
|
||||
$content = nl2br($content);
|
||||
|
||||
$pattern = '/(http?:\/\/\S*)/';
|
||||
$replacement = '<a href="$1">$1</a>';
|
||||
$content = preg_replace($pattern, $replacement, $content);
|
||||
|
||||
// replace _word_ by an underlined word
|
||||
$pattern = '/_([^\s]*)_/';
|
||||
$replacement = '<span style="text-decoration:underline;">\1</span>';
|
||||
$pattern = '/\b_(\S*)_\b/';
|
||||
$replacement = '<span style="text-decoration:underline;">$1</span>';
|
||||
$content = preg_replace($pattern, $replacement, $content);
|
||||
|
||||
// replace *word* by a bolded word
|
||||
$pattern = '/\*([^\s]*)\*/';
|
||||
$replacement = '<span style="font-weight:bold;">\1</span>';
|
||||
$pattern = '/\b\*(\S*)\*\b/';
|
||||
$replacement = '<span style="font-weight:bold;">$1</span>';
|
||||
$content = preg_replace($pattern, $replacement, $content);
|
||||
|
||||
// replace /word/ by an italic word
|
||||
$pattern = '/\/([^\s]*)\//';
|
||||
$replacement = '<span style="font-style:italic;">\1</span>';
|
||||
$content = preg_replace($pattern, $replacement, $content);
|
||||
$pattern = "/\/(\S*)\/(\s)/";
|
||||
$replacement = '<span style="font-style:italic;">$1$2</span>';
|
||||
$content = preg_replace($pattern, $replacement, $content);
|
||||
|
||||
return $content;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue