Changeset 1030


Ignore:
Timestamp:
Feb 9, 2006, 9:38:07 PM (18 years ago)
Author:
nikrou
Message:

merge branch 1.5 into trunk r1001:1002: bug 259 fixed

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/functions_html.inc.php

    r1014 r1030  
    410410{
    411411  $content = nl2br($content);
     412
     413  $pattern = '/(http?:\/\/\S*)/';
     414  $replacement = '<a href="$1">$1</a>';
     415  $content = preg_replace($pattern, $replacement, $content);
    412416 
    413417  // replace _word_ by an underlined word
    414   $pattern = '/_([^\s]*)_/';
    415   $replacement = '<span style="text-decoration:underline;">\1</span>';
     418  $pattern = '/\b_(\S*)_\b/';
     419  $replacement = '<span style="text-decoration:underline;">$1</span>';
    416420  $content = preg_replace($pattern, $replacement, $content);
    417421 
    418422  // replace *word* by a bolded word
    419   $pattern = '/\*([^\s]*)\*/';
    420   $replacement = '<span style="font-weight:bold;">\1</span>';
     423  $pattern = '/\b\*(\S*)\*\b/';
     424  $replacement = '<span style="font-weight:bold;">$1</span>';
    421425  $content = preg_replace($pattern, $replacement, $content);
    422426 
    423427  // replace /word/ by an italic word
    424   $pattern = '/\/([^\s]*)\//';
    425   $replacement = '<span style="font-style:italic;">\1</span>';
    426   $content = preg_replace($pattern, $replacement, $content);
     428   $pattern = "/\/(\S*)\/(\s)/";
     429   $replacement = '<span style="font-style:italic;">$1$2</span>';
     430   $content = preg_replace($pattern, $replacement, $content);
    427431
    428432  return $content;
Note: See TracChangeset for help on using the changeset viewer.