aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/includes/functions.php10
1 files changed, 3 insertions, 7 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 96d5c867d9..3e1c36bb14 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -978,11 +978,6 @@ function login_forum_box(&$forum_data)
{
global $db, $config, $user, $template, $phpEx;
- //TODO
- if ($forum_data['parent_id'])
- {
- }
-
$sql = 'SELECT *
FROM phpbb_forum_access
WHERE forum_id = ' . $forum_data['forum_id'] . '
@@ -1352,8 +1347,9 @@ function page_header($page_title = '')
'S_DISPLAY_PM' => (empty($config['privmsg_disable'])) ? 1 : 0,
'S_DISPLAY_MEMBERLIST' => (isset($auth)) ? $auth->acl_get('u_viewprofile') : 0,
- 'T_THEME_PATH' => 'styles/themes/' . $user->theme['primary']['theme_path'],
- 'T_STYLESHEET_LINK' => 'styles/themes/' . $user->theme['primary']['theme_path'] . '/' . $user->theme['primary']['theme_name'] . '.css')
+ 'T_THEME_PATH' => 'styles/themes/' . $user->theme['primary']['theme_path'],
+ 'T_STYLESHEET_LINK' => (!$user->theme['primary']['css_storedb']) ? 'styles/themes/' . $user->theme['primary']['theme_path'] . '/' . $user->theme['primary']['theme_name'] . '.css' : '',
+ 'T_THEME_DATA' => (!$user->theme['primary']['css_storedb']) ? '' : $user->theme['primary']['css_data'])
);
if (!empty($config['send_encoding']))