diff options
| author | Nils Adermann <naderman@naderman.de> | 2007-11-18 15:37:17 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-11-18 15:37:17 +0000 |
| commit | 271e819d003ee92bba70d3a4532afbba15acf895 (patch) | |
| tree | bdbf82e1bb4257b838c12c9b7947c0bfff0ea4bc /phpBB/includes/functions_content.php | |
| parent | 93a5ed70d9c29fe130aa909752f40b9b0aa7bf0c (diff) | |
| download | forums-271e819d003ee92bba70d3a4532afbba15acf895.tar forums-271e819d003ee92bba70d3a4532afbba15acf895.tar.gz forums-271e819d003ee92bba70d3a4532afbba15acf895.tar.bz2 forums-271e819d003ee92bba70d3a4532afbba15acf895.tar.xz forums-271e819d003ee92bba70d3a4532afbba15acf895.zip | |
- Constant PHPBB_DB_NEW_LINK introduced which can be used to force phpBB to create a new database connection instead of reusing an existing one if the dbms supports it [Bug #14927]
- Automatic URL parsing no longer allows dots in the schema but can parse URLs starting after a dot [Bug #15110]
- Dynamic width for birthday select boxes [Bug #15149]
git-svn-id: file:///svn/phpbb/trunk@8246 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_content.php')
| -rw-r--r-- | phpBB/includes/functions_content.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index cbd38cd478..b072895226 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -622,11 +622,11 @@ function make_clickable($text, $server_url = false, $class = 'postlink') // Be sure to not let the matches cross over. ;) // relative urls for this board - $magic_url_match[] = '#(^|[\n\t (>])(' . preg_quote($server_url, '#') . ')/(' . get_preg_expression('relative_url_inline') . ')#ie'; + $magic_url_match[] = '#(^|[\n\t (>.])(' . preg_quote($server_url, '#') . ')/(' . get_preg_expression('relative_url_inline') . ')#ie'; $magic_url_replace[] = "make_clickable_callback(MAGIC_URL_LOCAL, '\$1', '\$2', '\$3', '$local_class')"; // matches a xxxx://aaaaa.bbb.cccc. ... - $magic_url_match[] = '#(^|[\n\t (>])(' . get_preg_expression('url_inline') . ')#ie'; + $magic_url_match[] = '#(^|[\n\t (>.])(' . get_preg_expression('url_inline') . ')#ie'; $magic_url_replace[] = "make_clickable_callback(MAGIC_URL_FULL, '\$1', '\$2', '', '$class')"; // matches a "www.xxxx.yyyy[/zzzz]" kinda lazy URL thing |