makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2018-11-17 22:18:13 +01:00
commit 4036b2620b
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/includes/bbcode.php
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)
{ {

2
phpBB/includes/functions_content.php
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);