diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-01-07 10:48:43 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-01-07 10:48:43 +0100 |
| commit | 3ae016954212e90032a10d1427c34a4ff9d9637c (patch) | |
| tree | 984936f6d9c93958cac2dd4b83103eaf4cdf0907 /phpBB/phpbb/profilefields | |
| parent | 2a939fa779059b2eedc5eaf33706b4a1627ed30e (diff) | |
| parent | 0c3f7c6c8e352a73dacc1ff21a2b39a556ea6deb (diff) | |
| download | forums-3ae016954212e90032a10d1427c34a4ff9d9637c.tar forums-3ae016954212e90032a10d1427c34a4ff9d9637c.tar.gz forums-3ae016954212e90032a10d1427c34a4ff9d9637c.tar.bz2 forums-3ae016954212e90032a10d1427c34a4ff9d9637c.tar.xz forums-3ae016954212e90032a10d1427c34a4ff9d9637c.zip | |
Merge remote-tracking branch 'phpbb-security/prep-release-3.1.12' into prep-release-3.2.2
Diffstat (limited to 'phpBB/phpbb/profilefields')
| -rw-r--r-- | phpBB/phpbb/profilefields/type/type_string_common.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/profilefields/type/type_url.php | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/phpbb/profilefields/type/type_string_common.php b/phpBB/phpbb/profilefields/type/type_string_common.php index 2648d03930..f5e1992044 100644 --- a/phpBB/phpbb/profilefields/type/type_string_common.php +++ b/phpBB/phpbb/profilefields/type/type_string_common.php @@ -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; diff --git a/phpBB/phpbb/profilefields/type/type_url.php b/phpBB/phpbb/profilefields/type/type_url.php index 7bdd60e19d..37815b66a5 100644 --- a/phpBB/phpbb/profilefields/type/type_url.php +++ b/phpBB/phpbb/profilefields/type/type_url.php @@ -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); } } |