Merge remote branch 'p/ticket/10148' into develop

* p/ticket/10148:
  [ticket/10148] Turn TEMPLATE_BITFIELD into an instance variable.
This commit is contained in:
Andreas Fischer 2011-04-24 17:31:45 +02:00
commit 026358ec72

View file

@ -45,7 +45,7 @@ class acp_styles
$bitfield->set(9); $bitfield->set(9);
$bitfield->set(11); $bitfield->set(11);
$bitfield->set(12); $bitfield->set(12);
define('TEMPLATE_BITFIELD', $bitfield->get_base64()); $this->template_bitfield = $bitfield->get_base64();
unset($bitfield); unset($bitfield);
$user->add_lang('acp/styles'); $user->add_lang('acp/styles');
@ -3496,7 +3496,7 @@ parse_css_file = {PARSE_CSS_FILE}
} }
else else
{ {
$sql_ary['bbcode_bitfield'] = TEMPLATE_BITFIELD; $sql_ary['bbcode_bitfield'] = $this->template_bitfield;
} }
// We set a pre-defined bitfield here which we may use further in 3.2 // We set a pre-defined bitfield here which we may use further in 3.2