diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-12-22 16:28:27 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-12-22 16:28:27 +0000 |
| commit | 60d218245c0986cd35d9fc8ea2fab7f5f32a9e38 (patch) | |
| tree | b3e801e8a08805aef6eca2f8b2d08e147858c653 /phpBB/includes/bbcode.php | |
| parent | 088ed2c414bc0ebca59b486c1d44614fa6ff6456 (diff) | |
| download | forums-60d218245c0986cd35d9fc8ea2fab7f5f32a9e38.tar forums-60d218245c0986cd35d9fc8ea2fab7f5f32a9e38.tar.gz forums-60d218245c0986cd35d9fc8ea2fab7f5f32a9e38.tar.bz2 forums-60d218245c0986cd35d9fc8ea2fab7f5f32a9e38.tar.xz forums-60d218245c0986cd35d9fc8ea2fab7f5f32a9e38.zip | |
- ok, get away with the secondary style approach (styles can be mixed together easily with the acp)
- introduce a more generic approach of defining some additional variables through cfg files as well as the name, copyright and version fields
- please note that at the moment this is in flux. I added it now for Tom because he needs the theme parameters.
git-svn-id: file:///svn/phpbb/trunk@5372 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/bbcode.php')
| -rw-r--r-- | phpBB/includes/bbcode.php | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index a550bd40c3..ab0d742ede 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -103,20 +103,8 @@ class bbcode if (empty($this->template_filename)) { - $style = 'primary'; - if (!empty($user->theme['secondary'])) - { - // If the primary style has custom templates for BBCodes then we'll make sure - // the bbcode.html file is present, otherwise we'll use the secondary style - - if ($this->bbcode_bitfield & $user->theme['primary']['bbcode_bitfield']) - { - $style = (file_exists($phpbb_root_path . 'styles/' . $user->theme['primary']['template_path'] . '/template/bbcode.html')) ? 'primary' : 'secondary'; - } - } - - $this->template_bitfield = $user->theme[$style]['bbcode_bitfield']; - $this->template_filename = $phpbb_root_path . 'styles/' . $user->theme[$style]['template_path'] . '/template/bbcode.html'; + $this->template_bitfield = $user->theme['bbcode_bitfield']; + $this->template_filename = $phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template/bbcode.html'; } $sql = ''; |