diff options
| author | Bruno Ais <brunoaiss@gmail.com> | 2013-07-13 12:58:04 +0100 |
|---|---|---|
| committer | Bruno Ais <brunoaiss@gmail.com> | 2013-07-13 12:58:04 +0100 |
| commit | 31fed4215067ee39e7396f010a06093fe66352ee (patch) | |
| tree | 147330f80f1d7e7ee31f1ee4d7aebb68155b50ec | |
| parent | b5651c0289054f2f4453806200506968241f9a82 (diff) | |
| download | forums-31fed4215067ee39e7396f010a06093fe66352ee.tar forums-31fed4215067ee39e7396f010a06093fe66352ee.tar.gz forums-31fed4215067ee39e7396f010a06093fe66352ee.tar.bz2 forums-31fed4215067ee39e7396f010a06093fe66352ee.tar.xz forums-31fed4215067ee39e7396f010a06093fe66352ee.zip | |
[ticket/11656] generate_text_for_display on memberlist.php
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11656
| -rw-r--r-- | phpBB/memberlist.php | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 7ecf332720..6156e6a292 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -561,17 +561,8 @@ switch ($mode) if ($member['user_sig']) { - $member['user_sig'] = censor_text($member['user_sig']); - - if ($member['user_sig_bbcode_bitfield']) - { - include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); - $bbcode = new bbcode(); - $bbcode->bbcode_second_pass($member['user_sig'], $member['user_sig_bbcode_uid'], $member['user_sig_bbcode_bitfield']); - } - - $member['user_sig'] = bbcode_nl2br($member['user_sig']); - $member['user_sig'] = smiley_text($member['user_sig']); + $member['user_sig'] = generate_text_for_display($member['user_sig'], $member['user_sig_bbcode_uid'], + $member['user_sig_bbcode_bitfield'], OPTION_FLAG_BBCODE || OPTION_FLAG_SMILIES, true); } $poster_avatar = phpbb_get_user_avatar($member); |