diff options
| author | Nils Adermann <naderman@naderman.de> | 2007-01-13 22:32:03 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-01-13 22:32:03 +0000 |
| commit | e6421f9274d3932539974790db1fcf81027a4db5 (patch) | |
| tree | cf333c81622a49349ae1c089fc68dc5ade37204e /phpBB/develop/regex.php | |
| parent | 9372acd0170cf255dd0a1551479e6d75c7af7008 (diff) | |
| download | forums-e6421f9274d3932539974790db1fcf81027a4db5.tar forums-e6421f9274d3932539974790db1fcf81027a4db5.tar.gz forums-e6421f9274d3932539974790db1fcf81027a4db5.tar.bz2 forums-e6421f9274d3932539974790db1fcf81027a4db5.tar.xz forums-e6421f9274d3932539974790db1fcf81027a4db5.zip | |
- 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
Diffstat (limited to 'phpBB/develop/regex.php')
| -rw-r--r-- | phpBB/develop/regex.php | 2 |
1 files changed, 1 insertions, 1 deletions
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)?"; |