From e6421f9274d3932539974790db1fcf81027a4db5 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sat, 13 Jan 2007 22:32:03 +0000 Subject: - solved a problem with magic urls inside brackets, and with bbcodes being treated as IPv6 addresses - turn NOT IN () and IN () into 1=1 and 1=0 so the database will understand it, instead of throwing an error in sql_in_set [Bug #7118] - some tiny fixes to fulltext_native git-svn-id: file:///svn/phpbb/trunk@6886 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/regex.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/develop/regex.php') diff --git a/phpBB/develop/regex.php b/phpBB/develop/regex.php index 1719fe03e9..7abecc9650 100644 --- a/phpBB/develop/regex.php +++ b/phpBB/develop/regex.php @@ -49,7 +49,7 @@ $scheme = '[a-z][a-z\d+\-.]*'; $reg_name = "(?:[$unreserved$sub_delims|@]+|$pct_encoded)+"; // rfc: * instead of + and no "|" and no "@" (included instead of userinfo //$userinfo = "(?:(?:[$unreserved$sub_delims:]+|$pct_encoded))*"; $ipv4_simple = '[0-9.]+'; -$ipv6_simple = '\[[a-z0-9.:]+\]'; +$ipv6_simple = '\[[a-z0-9.]+:[a-z0-9.]+:[a-z0-9.:]+\]'; $host = "(?:$reg_name|$ipv4_simple|$ipv6_simple)"; $port = '\d*'; //$authority = "(?:$userinfo@)?$host(?::$port)?"; -- cgit v1.2.1