aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2003-07-21 00:44:22 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2003-07-21 00:44:22 +0000
commitb3d94f5c9a3c8035fa05e28a3c35764836738102 (patch)
treeaa71261005429e2acd1c2e43182fbeb6058d01b7 /phpBB/includes/functions.php
parent2ca95fed52edbf7a3b7a51ebacc0205240d9c5e7 (diff)
downloadforums-b3d94f5c9a3c8035fa05e28a3c35764836738102.tar
forums-b3d94f5c9a3c8035fa05e28a3c35764836738102.tar.gz
forums-b3d94f5c9a3c8035fa05e28a3c35764836738102.tar.bz2
forums-b3d94f5c9a3c8035fa05e28a3c35764836738102.tar.xz
forums-b3d94f5c9a3c8035fa05e28a3c35764836738102.zip
Send DB stored css data to template if necessary ... yes, I realise this won't be cached like a normal stylesheet but there are potential ways around that
git-svn-id: file:///svn/phpbb/trunk@4303 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-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']))