1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00

Merge pull request #6024 from rxu/ticket/16549-master

[master][ticket/16549] Use PHPUnit 9.3+ for PHP 8.0+ tests
This commit is contained in:
Marc Alexander
2020-11-15 20:49:28 +01:00
122 changed files with 1023 additions and 614 deletions

View File

@@ -1010,7 +1010,7 @@ function make_clickable($text, $server_url = false, string $class = 'postlink')
if (preg_match($magic_args[0], $text, $matches))
{
// Only apply $class from the corresponding function call argument (excepting emails which never has a class)
if ($magic_args[3] != $static_class && $magic_args[1] != MAGIC_URL_EMAIL)
if ($magic_args[1] != MAGIC_URL_EMAIL && $magic_args[3] != $static_class)
{
continue;
}