diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-06-11 20:33:11 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-06-11 20:33:11 -0400 |
| commit | 436ade19fcef64ea5f5cd399018d0c7e9289452b (patch) | |
| tree | 3a370181e7d0ecf1e83e3e1a140ae1cd763b0299 /phpBB/includes/bbcode.php | |
| parent | 1564da616b810c33afaa2ddbebfb0b2a2741ba12 (diff) | |
| parent | 71ca9b4fe69dea8150a5d3c6f30dd177c488ff2b (diff) | |
| download | forums-436ade19fcef64ea5f5cd399018d0c7e9289452b.tar forums-436ade19fcef64ea5f5cd399018d0c7e9289452b.tar.gz forums-436ade19fcef64ea5f5cd399018d0c7e9289452b.tar.bz2 forums-436ade19fcef64ea5f5cd399018d0c7e9289452b.tar.xz forums-436ade19fcef64ea5f5cd399018d0c7e9289452b.zip | |
Merge PR #839 branch 'p/ticket/10743' into develop
* p/ticket/10743:
[ticket/10743] Renaming user->theme
[ticket/10743] Changing obtain_cfg_items
Diffstat (limited to 'phpBB/includes/bbcode.php')
| -rw-r--r-- | phpBB/includes/bbcode.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index fde917e5b1..444446e9c3 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -130,7 +130,7 @@ class bbcode if (empty($this->template_filename)) { - $this->template_bitfield = new bitfield($user->theme['bbcode_bitfield']); + $this->template_bitfield = new bitfield($user->style['bbcode_bitfield']); $style_resource_locator = new phpbb_style_resource_locator(); $style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider()); |