aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornikrou <nikrou@piwigo.org>2006-02-09 20:38:07 +0000
committernikrou <nikrou@piwigo.org>2006-02-09 20:38:07 +0000
commitc8e9793412ac8207754021a69753ead23a6c29d5 (patch)
tree51f81cfbbb24d094d17aa9aa45dfc4d0262e3b2b
parent0e78db47de2041912447dd5bbbfafb7684e7480f (diff)
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
Diffstat (limited to '')
-rw-r--r--include/functions_html.inc.php18
1 files changed, 11 insertions, 7 deletions
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index bff44f620..bee99f92f 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -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;
}