diff options
| author | Bruno Ais <brunoaiss@gmail.com> | 2013-07-24 12:31:14 +0100 |
|---|---|---|
| committer | Bruno Ais <brunoaiss@gmail.com> | 2013-07-24 12:31:14 +0100 |
| commit | 029015e1542e7719d4a35d350093f4dfb3a7313e (patch) | |
| tree | 651fefd67fb901881856cfed94799da6d305df76 /phpBB/viewtopic.php | |
| parent | 4ed322b5b8642ec8d0a6faf23d9ea751e81dbf69 (diff) | |
| download | forums-029015e1542e7719d4a35d350093f4dfb3a7313e.tar forums-029015e1542e7719d4a35d350093f4dfb3a7313e.tar.gz forums-029015e1542e7719d4a35d350093f4dfb3a7313e.tar.bz2 forums-029015e1542e7719d4a35d350093f4dfb3a7313e.tar.xz forums-029015e1542e7719d4a35d350093f4dfb3a7313e.zip | |
[ticket/11638] Reverted to use the $parse tags way as the other ones
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11638
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 303b9bb6da..a0e7eb6a94 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1381,9 +1381,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'])) { - $parse_flags = phpbb_optionset(OPTION_FLAG_SMILIES, true, 0); - $parse_flags = phpbb_optionset(OPTION_FLAG_BBCODE, $user_cache[$poster_id]['sig_bbcode_bitfield'], $parse_flag); - $user_cache[$poster_id]['sig'] = generate_text_for_display($user_cache[$poster_id]['sig'], $user_cache[$poster_id]['sig_bbcode_uid'], $parse_flags, true); + $parse_flags = ($user_cache[$poster_id]['sig_bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES; + $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'], $parse_flags, true); } // Parse the message and subject |