1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-30 19:24:13 +02:00

[ticket/security/211] Allow make_clickable() again after change to regex

SECURITY-211
This commit is contained in:
Marc Alexander 2017-08-03 22:20:33 +02:00
parent f7d387f93c
commit 342a7cbd55
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
3 changed files with 3 additions and 4 deletions

View File

@ -108,6 +108,7 @@ abstract class type_string_common extends type_base
return null;
}
$field_value = make_clickable($field_value);
$field_value = censor_text($field_value);
$field_value = bbcode_nl2br($field_value);
return $field_value;

View File

@ -82,8 +82,6 @@ class type_url extends type_string
return null;
}
$field_value = make_clickable($field_value);
return parent::get_profile_value($field_value, $field_data);
}
}

View File

@ -273,8 +273,8 @@ class phpbb_profilefield_type_string_test extends phpbb_test_case
array(
'http://foobar.com',
array('field_show_novalue' => false),
'http://foobar.com',
'Field should output the given value but not make it clickable',
'<!-- l --><a class="postlink-local" href="http://foobar.com">foobar.com</a><!-- l -->',
'Field should output the given value and make it clickable',
),
array(
'javascript://foobar.com',