aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_bbcodes.php
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2007-02-17 04:51:57 +0000
committerDavid M <davidmj@users.sourceforge.net>2007-02-17 04:51:57 +0000
commitbb7c0ded605826b8261c1b215253d7958a773777 (patch)
treebf3135455f24181448720c8ed614b00023596049 /phpBB/includes/acp/acp_bbcodes.php
parent4a83eb22da3b576a1feaf9bd1e021068d0a310bd (diff)
downloadforums-bb7c0ded605826b8261c1b215253d7958a773777.tar
forums-bb7c0ded605826b8261c1b215253d7958a773777.tar.gz
forums-bb7c0ded605826b8261c1b215253d7958a773777.tar.bz2
forums-bb7c0ded605826b8261c1b215253d7958a773777.tar.xz
forums-bb7c0ded605826b8261c1b215253d7958a773777.zip
#8090
git-svn-id: file:///svn/phpbb/trunk@6998 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_bbcodes.php')
-rw-r--r--phpBB/includes/acp/acp_bbcodes.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index 9c2d19168a..6a492787a1 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -295,10 +295,10 @@ class acp_bbcodes
// @todo Make sure to change this too if something changed in message parsing
$tokens = array(
'URL' => array(
- '!([a-z0-9]+://)?([^?].*?[^ \t\n\r<"]*)!ie' => "(('\$1') ? '\$1\$2' : 'http://\$2')"
+ '!([a-z0-9]+://)?([^< "\r\n\t\]]*)!ie' => "(('\$1') ? '\$1\$2' : 'http://\$2')"
),
'LOCAL_URL' => array(
- '!([^:]+/[^ \t\n\r<"]*)!' => '$1'
+ '!([^:]+/[^< "\r\n\t\]]*)!' => '$1'
),
'EMAIL' => array(
'!([a-z0-9]+[a-z0-9\-\._]*@(?:(?:[0-9]{1,3}\.){3,5}[0-9]{1,3}|[a-z0-9]+[a-z0-9\-\._]*\.[a-z]+))!i' => '$1'