aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2008-11-10 16:24:18 +0000
committerHenry Sudhof <kellanved@phpbb.com>2008-11-10 16:24:18 +0000
commitd14303299549f65867829cb4812df919e5de8fc7 (patch)
treeb7bd30e309aad8ff9eb8bd7819ed68a2f6ecc9d4 /phpBB
parent2b477bad8fd492f0be052f1019ae3a427ae263b4 (diff)
downloadforums-d14303299549f65867829cb4812df919e5de8fc7.tar
forums-d14303299549f65867829cb4812df919e5de8fc7.tar.gz
forums-d14303299549f65867829cb4812df919e5de8fc7.tar.bz2
forums-d14303299549f65867829cb4812df919e5de8fc7.tar.xz
forums-d14303299549f65867829cb4812df919e5de8fc7.zip
inheritance is reflexive
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9057 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/functions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index fabb1e1aa3..b96024e4e3 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3707,7 +3707,7 @@ function page_header($page_title = '', $display_online_list = true)
'T_THEME_PATH' => "{$phpbb_root_path}styles/" . $user->theme['theme_path'] . '/theme',
'T_TEMPLATE_PATH' => "{$phpbb_root_path}styles/" . $user->theme['template_path'] . '/template',
- 'T_SUPER_TEMPLATE_PATH' => (isset($user->theme['template_inherit_path'])) ? "{$phpbb_root_path}styles/" . $user->theme['template_inherit_path'] . '/template' : '',
+ 'T_SUPER_TEMPLATE_PATH' => (isset($user->theme['template_inherit_path']) && $user->theme['template_inherit_path']) ? "{$phpbb_root_path}styles/" . $user->theme['template_inherit_path'] . '/template' : "{$phpbb_root_path}styles/" . $user->theme['template_path'] . '/template',
'T_IMAGESET_PATH' => "{$phpbb_root_path}styles/" . $user->theme['imageset_path'] . '/imageset',
'T_IMAGESET_LANG_PATH' => "{$phpbb_root_path}styles/" . $user->theme['imageset_path'] . '/imageset/' . $user->data['user_lang'],
'T_IMAGES_PATH' => "{$phpbb_root_path}images/",