diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-04-24 17:31:45 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-04-24 17:31:45 +0200 |
| commit | 026358ec72d0451075ee44c6edf0d721c6bf111c (patch) | |
| tree | e90f0c955cbceaf03993389faec643a99ffd73d2 /phpBB/includes/acp | |
| parent | 1ec2ab6689c8498ef02a3ed309e8421a437b0365 (diff) | |
| parent | dfbbc4797ea9908db727e5fc51d06bd55cd0c472 (diff) | |
| download | forums-026358ec72d0451075ee44c6edf0d721c6bf111c.tar forums-026358ec72d0451075ee44c6edf0d721c6bf111c.tar.gz forums-026358ec72d0451075ee44c6edf0d721c6bf111c.tar.bz2 forums-026358ec72d0451075ee44c6edf0d721c6bf111c.tar.xz forums-026358ec72d0451075ee44c6edf0d721c6bf111c.zip | |
Merge remote branch 'p/ticket/10148' into develop
* p/ticket/10148:
[ticket/10148] Turn TEMPLATE_BITFIELD into an instance variable.
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 6a0d4c4c98..e32a4d2310 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -45,7 +45,7 @@ class acp_styles $bitfield->set(9); $bitfield->set(11); $bitfield->set(12); - define('TEMPLATE_BITFIELD', $bitfield->get_base64()); + $this->template_bitfield = $bitfield->get_base64(); unset($bitfield); $user->add_lang('acp/styles'); @@ -3496,7 +3496,7 @@ parse_css_file = {PARSE_CSS_FILE} } 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 |