[ticket/15875] Fix PHP fatal error on BBCode parsing

PHPBB3-15875
This commit is contained in:
rxu 2018-11-18 01:33:56 +07:00
parent 7801bac09a
commit da9da88d11
No known key found for this signature in database
GPG key ID: 955F0567380E586A
2 changed files with 11 additions and 2 deletions

View file

@ -35,9 +35,18 @@ class bbcode
/** /**
* Constructor * Constructor
* Init bbcode cache entries if bitfield is specified
*/ */
function __construct($bitfield = '') function __construct($bitfield = '')
{
$this->bbcode_set_bitfield($bitfield);
}
/**
* Init bbcode cache entries if bitfield is specified
*
* @param string $bbcode_bitfield The bbcode bitfield
*/
function bbcode_set_bitfield($bitfield = '')
{ {
if ($bitfield) if ($bitfield)
{ {

View file

@ -627,7 +627,7 @@ function generate_text_for_display($text, $uid, $bitfield, $flags, $censor_text
} }
else else
{ {
$bbcode->bbcode($bitfield); $bbcode->bbcode_set_bitfield($bitfield);
} }
$bbcode->bbcode_second_pass($text, $uid); $bbcode->bbcode_second_pass($text, $uid);