diff options
| author | Bruno Ais <brunoaiss@gmail.com> | 2013-07-24 11:59:28 +0100 |
|---|---|---|
| committer | Bruno Ais <brunoaiss@gmail.com> | 2013-07-24 11:59:28 +0100 |
| commit | 4ed322b5b8642ec8d0a6faf23d9ea751e81dbf69 (patch) | |
| tree | 595bc1bbe04b0f083355c2ba815e7306816ddc44 | |
| parent | 73414823048cac8c2963b2034ba13daaf60c3fee (diff) | |
| download | forums-4ed322b5b8642ec8d0a6faf23d9ea751e81dbf69.tar forums-4ed322b5b8642ec8d0a6faf23d9ea751e81dbf69.tar.gz forums-4ed322b5b8642ec8d0a6faf23d9ea751e81dbf69.tar.bz2 forums-4ed322b5b8642ec8d0a6faf23d9ea751e81dbf69.tar.xz forums-4ed322b5b8642ec8d0a6faf23d9ea751e81dbf69.zip | |
[ticket/11638] Updated: bitwise $parse_flags use optionset()
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11638
| -rw-r--r-- | phpBB/viewtopic.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index de76d1186d..303b9bb6da 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1381,8 +1381,9 @@ 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'])) { - $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_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 the message and subject |