mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 22:28:51 +00:00
Move second parse cache init after assignment of bitfield ... in case bitfield isn't set globally
git-svn-id: file:///svn/phpbb/trunk@3914 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
663144718d
commit
d30d4987f3
1 changed files with 5 additions and 6 deletions
|
@ -36,11 +36,6 @@ class bbcode
|
||||||
|
|
||||||
function bbcode_second_pass(&$message, $bbcode_uid = '', $bbcode_bitfield = '')
|
function bbcode_second_pass(&$message, $bbcode_uid = '', $bbcode_bitfield = '')
|
||||||
{
|
{
|
||||||
if (empty($this->bbcode_cache))
|
|
||||||
{
|
|
||||||
$this->bbcode_cache_init();
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($bbcode_uid)
|
if ($bbcode_uid)
|
||||||
{
|
{
|
||||||
$this->bbcode_uid = $bbcode_uid;
|
$this->bbcode_uid = $bbcode_uid;
|
||||||
|
@ -50,6 +45,11 @@ class bbcode
|
||||||
$this->bbcode_bitfield = $bbcode_bitfield;
|
$this->bbcode_bitfield = $bbcode_bitfield;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (empty($this->bbcode_cache))
|
||||||
|
{
|
||||||
|
$this->bbcode_cache_init();
|
||||||
|
}
|
||||||
|
|
||||||
$str = array('search' => array(), 'replace' => array());
|
$str = array('search' => array(), 'replace' => array());
|
||||||
$preg = array('search' => array(), 'replace' => array());
|
$preg = array('search' => array(), 'replace' => array());
|
||||||
|
|
||||||
|
@ -101,7 +101,6 @@ class bbcode
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
$bbcode_ids[] = $bbcode_id;
|
$bbcode_ids[] = $bbcode_id;
|
||||||
|
|
||||||
// WARNING: hardcoded values. it assumes that bbcodes with bbcode_id > 11 are user-defined bbcodes
|
// WARNING: hardcoded values. it assumes that bbcodes with bbcode_id > 11 are user-defined bbcodes
|
||||||
|
|
Loading…
Add table
Reference in a new issue