diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-12-31 17:12:50 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-12-31 17:12:50 +0100 |
| commit | b2dacefbe7123cf8e4e854b2f4de959d82ab1ee2 (patch) | |
| tree | e23e7665082f5c9453c42732d24b601b891fc436 /phpBB/develop | |
| parent | 93621aa1844ab48d9bae068d9872d2c49ae86de4 (diff) | |
| parent | 0c3f7c6c8e352a73dacc1ff21a2b39a556ea6deb (diff) | |
| download | forums-b2dacefbe7123cf8e4e854b2f4de959d82ab1ee2.tar forums-b2dacefbe7123cf8e4e854b2f4de959d82ab1ee2.tar.gz forums-b2dacefbe7123cf8e4e854b2f4de959d82ab1ee2.tar.bz2 forums-b2dacefbe7123cf8e4e854b2f4de959d82ab1ee2.tar.xz forums-b2dacefbe7123cf8e4e854b2f4de959d82ab1ee2.zip | |
Merge branch 'prep-release-3.1.12' into 3.1.x
Diffstat (limited to 'phpBB/develop')
| -rw-r--r-- | phpBB/develop/regex_idn.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/develop/regex_idn.php b/phpBB/develop/regex_idn.php index d871695c50..30373f8de3 100644 --- a/phpBB/develop/regex_idn.php +++ b/phpBB/develop/regex_idn.php @@ -120,7 +120,7 @@ do $pct_encoded = "%[\dA-F]{2}"; $unreserved = "$add_chars\pL0-9\-._~"; $sub_delims = ($inline) ? '!$&\'(*+,;=' : '!$&\'()*+,;='; - $scheme = ($inline) ? '[a-z][a-z\d+]*': '[a-z][a-z\d+\-.]*' ; // avoid automatic parsing of "word" in "last word.http://..." + $scheme = ($inline) ? '[a-z][a-z\d+]*(?<!javascript)': '[a-z][a-z\d+\-.]*(?<!javascript)' ; // avoid automatic parsing of "word" in "last word.http://..." $pchar = "(?:[^$remove_chars]*[$unreserved$sub_delims:@|]+|$pct_encoded)"; // rfc: no "|" $reg_name = "(?:[^$remove_chars]*[$unreserved$sub_delims:@|]+|$pct_encoded)+"; // rfc: * instead of + and no "|" and no "@" and no ":" (included instead of userinfo) |