aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php13
1 files changed, 12 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 5608b2f252..ac4aed3dd9 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -225,7 +225,7 @@ function make_forum_box($box_name, $default_forum = -1)
// Initialise user settings on page load
function init_userprefs($userdata)
{
- global $board_config, $theme, $template, $lang, $phpEx, $phpbb_root_path;
+ global $board_config, $theme, $images, $template, $lang, $phpEx, $phpbb_root_path;
if(!$board_config['override_user_themes'])
{
@@ -272,6 +272,17 @@ function init_userprefs($userdata)
$template = new Template($phpbb_root_path . "templates/" . $board_config['default_template']);
+ if($template)
+ {
+ @include($phpbb_root_path . "templates/" . $board_config['default_template'] . "/" . $board_config['default_template'] . ".cfg");
+
+ if( !defined("TEMPLATE_CONFIG") )
+ {
+ message_die(CRITICAL_MESSAGE, "Couldn't open " . $board_config['default_template'] . " template config file");
+ }
+
+ }
+
if(file_exists("language/lang_".$board_config['default_lang'].".".$phpEx) )
{
include($phpbb_root_path . 'language/lang_'.$board_config['default_lang'].'.'.$phpEx);