diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-04-25 03:17:21 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-04-25 03:17:21 +0000 |
| commit | c57ebe71a9dadf2fd37113cbcd8e56f445af8ec9 (patch) | |
| tree | ec516fac1bb1e36d6aa02f584d82266af267702a /phpBB | |
| parent | a279978718c6d21523b5603fde6cf67a91d5ca8c (diff) | |
| download | forums-c57ebe71a9dadf2fd37113cbcd8e56f445af8ec9.tar forums-c57ebe71a9dadf2fd37113cbcd8e56f445af8ec9.tar.gz forums-c57ebe71a9dadf2fd37113cbcd8e56f445af8ec9.tar.bz2 forums-c57ebe71a9dadf2fd37113cbcd8e56f445af8ec9.tar.xz forums-c57ebe71a9dadf2fd37113cbcd8e56f445af8ec9.zip | |
- Bug #1285
git-svn-id: file:///svn/phpbb/trunk@5843 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 699dd4c9f5..bd3860e974 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1788,15 +1788,15 @@ function make_clickable($text, $server_url = false) // Be sure to not let the matches cross over. ;) // relative urls for this board - $magic_url_match[] = '#(^|[\n ]|\()(' . preg_quote($server_url, '#') . ')/(([^ \t\n\r<"\'\)&]+|&(?!lt;))*)#i'; + $magic_url_match[] = '#(^|[\n ]|\()(' . preg_quote($server_url, '#') . ')/(([^[ \t\n\r<"\'\)&]+|&(?!lt;))*)#i'; $magic_url_replace[] = '$1<!-- l --><a href="$2/$3">$3</a><!-- l -->'; // matches a xxxx://aaaaa.bbb.cccc. ... - $magic_url_match[] = '#(^|[\n ]|\()([\w]+:/{2}.*?([^ \t\n\r<"\'\)&]+|&(?!lt;))*)#ie'; + $magic_url_match[] = '#(^|[\n ]|\()([\w]+:/{2}.*?([^[ \t\n\r<"\'\)&]+|&(?!lt;))*)#ie'; $magic_url_replace[] = "'\$1<!-- m --><a href=\"\$2\" target=\"_blank\">' . ((strlen('\$2') > 55) ? substr(str_replace('&', '&', '\$2'), 0, 39) . ' ... ' . substr(str_replace('&', '&', '\$2'), -10) : '\$2') . '</a><!-- m -->'"; // matches a "www.xxxx.yyyy[/zzzz]" kinda lazy URL thing - $magic_url_match[] = '#(^|[\n ]|\()(w{3}\.[\w\-]+\.[\w\-.\~]+(?:[^ \t\n\r<"\'\)&]+|&(?!lt;))*)#ie'; + $magic_url_match[] = '#(^|[\n ]|\()(w{3}\.[\w\-]+\.[\w\-.\~]+(?:[^[ \t\n\r<"\'\)&]+|&(?!lt;))*)#ie'; $magic_url_replace[] = "'\$1<!-- w --><a href=\"http://\$2\" target=\"_blank\">' . ((strlen('\$2') > 55) ? substr(str_replace('&', '&', '\$2'), 0, 39) . ' ... ' . substr(str_replace('&', '&', '\$2'), -10) : '\$2') . '</a><!-- w -->'"; // matches an email@domain type address at the start of a line, or after a space. |