diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-04-01 19:52:44 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-04-01 19:52:44 +0200 |
| commit | 9a075e905d23110f0b3310f9bfe6e89b44be1b57 (patch) | |
| tree | fb87c78dc1c8fcd26b93c285011311a6ab8ce20e /phpBB/includes/functions.php | |
| parent | 813e52a03ad654a357439d6d80f66a18b189eb62 (diff) | |
| parent | 37480e5594145bbead07c8f70644d52983f92913 (diff) | |
| download | forums-9a075e905d23110f0b3310f9bfe6e89b44be1b57.tar forums-9a075e905d23110f0b3310f9bfe6e89b44be1b57.tar.gz forums-9a075e905d23110f0b3310f9bfe6e89b44be1b57.tar.bz2 forums-9a075e905d23110f0b3310f9bfe6e89b44be1b57.tar.xz forums-9a075e905d23110f0b3310f9bfe6e89b44be1b57.zip | |
Merge remote-tracking branch 'cyberalien/ticket/10665' into develop
* cyberalien/ticket/10665:
[ticket/10665] Adding includejs to acp templates
[ticket/10665] Solution for T_SUPER_TEMPLATE_PATH
[ticket/10665] New test class for templates with tree
[ticket/10665] Changing template->_js_include to public
[ticket/10665] Moving filter parameters to one array
[ticket/10665] INCLUDEJS unit test
[ticket/10665] Changing template compiler test
[ticket/10665] INCLUDEJS template changes
[ticket/10665] INCLUDEJS template tag
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 74db8cb8fd..a44ebb04e8 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4770,7 +4770,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 'T_ASSETS_PATH' => "{$web_path}assets", 'T_THEME_PATH' => "{$web_path}styles/" . rawurlencode($user->theme['style_path']) . '/theme', 'T_TEMPLATE_PATH' => "{$web_path}styles/" . rawurlencode($user->theme['style_path']) . '/template', - 'T_SUPER_TEMPLATE_PATH' => ($user->theme['style_parent_id']) ? "{$web_path}styles/" . rawurlencode($user->theme['style_parent_tree']) . '/template' : "{$web_path}styles/" . rawurlencode($user->theme['style_path']) . '/template', + 'T_SUPER_TEMPLATE_PATH' => "{$web_path}styles/" . rawurlencode($user->theme['style_path']) . '/template', 'T_IMAGES_PATH' => "{$web_path}images/", 'T_SMILIES_PATH' => "{$web_path}{$config['smilies_path']}/", 'T_AVATAR_PATH' => "{$web_path}{$config['avatar_path']}/", |