aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Ais <brunoaiss@gmail.com>2013-07-13 15:56:55 +0100
committerBruno Ais <brunoaiss@gmail.com>2013-07-13 15:56:55 +0100
commit402d987ccbeacb494f1147cdee047a6cf1f19f7b (patch)
tree947c53e43267db71a9a097212b4ad325874793e9
parentfca4bc53232e22233711a275e252a8006dd89e9a (diff)
downloadforums-402d987ccbeacb494f1147cdee047a6cf1f19f7b.tar
forums-402d987ccbeacb494f1147cdee047a6cf1f19f7b.tar.gz
forums-402d987ccbeacb494f1147cdee047a6cf1f19f7b.tar.bz2
forums-402d987ccbeacb494f1147cdee047a6cf1f19f7b.tar.xz
forums-402d987ccbeacb494f1147cdee047a6cf1f19f7b.zip
[ticket/11656] Wrong bitwise OR
sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11656
-rw-r--r--phpBB/memberlist.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 09b9dab5c1..f8ee82084c 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -561,7 +561,7 @@ switch ($mode)
if ($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);
+ $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);