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/functions_display.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/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index adb838f371..15f48e10b4 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -507,7 +507,7 @@ function topic_generate_pagination($replies, $url) } else if ($times < $total_pages) { - $pagination .= $user->theme['primary']['pagination_sep']; + $pagination .= $user->theme['pagination_sep']; } $times++; } @@ -674,15 +674,7 @@ function display_attachments($forum_id, $blockname, &$attachment_data, &$update_ { $attachment_tpl = array(); - // Generate Template - $style = 'primary'; - - if (!empty($user->theme['secondary'])) - { - $style = (file_exists($phpbb_root_path . 'styles/' . $user->theme['primary']['template_path'] . '/template/attachment.html')) ? 'primary' : 'secondary'; - } - - $template_filename = $phpbb_root_path . 'styles/' . $user->theme[$style]['template_path'] . '/template/attachment.html'; + $template_filename = $phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template/attachment.html'; if (!($fp = @fopen($template_filename, 'rb'))) { trigger_error('Could not load template file "' . $template_filename . '"'); |