diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-01-07 18:43:45 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-01-07 18:43:45 +0100 |
| commit | 7e2136587a4d5f2f011189aca6f94ee6a780eaf1 (patch) | |
| tree | 763217246e4df1f69d6612c0ed1397bc05fbec74 /phpBB/develop | |
| parent | 182a96f2738316adcb292816a9ac8af0e0cb5866 (diff) | |
| parent | 77b275181aeddf43e1077d06abce11a9722bb85a (diff) | |
| download | forums-7e2136587a4d5f2f011189aca6f94ee6a780eaf1.tar forums-7e2136587a4d5f2f011189aca6f94ee6a780eaf1.tar.gz forums-7e2136587a4d5f2f011189aca6f94ee6a780eaf1.tar.bz2 forums-7e2136587a4d5f2f011189aca6f94ee6a780eaf1.tar.xz forums-7e2136587a4d5f2f011189aca6f94ee6a780eaf1.zip | |
Merge branch 'prep-release-3.2.2' into 3.2.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) |