diff options
| author | Bruno Ais <brunoaiss@gmail.com> | 2013-07-13 14:35:22 +0100 |
|---|---|---|
| committer | Bruno Ais <brunoaiss@gmail.com> | 2013-07-13 16:55:36 +0100 |
| commit | a58ccdabf30cad5b0373c266fc69368c65cee1a1 (patch) | |
| tree | 711298bb9e7c9fb578834be7c08731a21ea2f801 /phpBB | |
| parent | 97054d81f82123f17cd3680326932a8fd021ffa2 (diff) | |
| download | forums-a58ccdabf30cad5b0373c266fc69368c65cee1a1.tar forums-a58ccdabf30cad5b0373c266fc69368c65cee1a1.tar.gz forums-a58ccdabf30cad5b0373c266fc69368c65cee1a1.tar.bz2 forums-a58ccdabf30cad5b0373c266fc69368c65cee1a1.tar.xz forums-a58ccdabf30cad5b0373c266fc69368c65cee1a1.zip | |
[ticket/11638] generate_text_for_display on viewtopic.php
lines: 1395-1403
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11638
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/viewtopic.php | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index d295b91f43..34586b1491 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1380,16 +1380,8 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) // End signature parsing, only if needed if ($user_cache[$poster_id]['sig'] && $row['enable_sig'] && empty($user_cache[$poster_id]['sig_parsed'])) { - $user_cache[$poster_id]['sig'] = censor_text($user_cache[$poster_id]['sig']); - - if ($user_cache[$poster_id]['sig_bbcode_bitfield']) - { - $bbcode->bbcode_second_pass($user_cache[$poster_id]['sig'], $user_cache[$poster_id]['sig_bbcode_uid'], $user_cache[$poster_id]['sig_bbcode_bitfield']); - } - - $user_cache[$poster_id]['sig'] = bbcode_nl2br($user_cache[$poster_id]['sig']); - $user_cache[$poster_id]['sig'] = smiley_text($user_cache[$poster_id]['sig']); - $user_cache[$poster_id]['sig_parsed'] = true; + $include_bbcode_parse = $user_cache[$poster_id]['sig_bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0; + $user_cache[$poster_id]['sig'] = generate_text_for_display($user_cache[$poster_id]['sig'], $user_cache[$poster_id]['sig_bbcode_uid'], $user_cache[$poster_id]['sig_bbcode_bitfield'], $include_bbcode_parse | OPTION_FLAG_SMILIES, true); } // Parse the message and subject |