mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-03 23:37:39 +02:00
Code Issues Releases Wiki Activity

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

Browse Source 
SECURITY-211
This commit is contained in:
Marc Alexander
2017-08-03 22:20:33 +02:00
parent f7d387f93c
commit 342a7cbd55
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/phpbb/profilefields/type/type_string_common.php
View File

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

2
phpBB/phpbb/profilefields/type/type_url.php
View File

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

4
tests/profilefields/type_string_test.php
View File

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