aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/style.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-08-19 15:58:31 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-08-19 15:58:31 +0000
commit1be20d2e30ee621201752f78b8f232f424b81f4f (patch)
tree5d5ce8ee6af37c0d3483f2050d994d3f90267210 /phpBB/style.php
parentcf4950f4c60738944ffe1d51b1463dcab6994845 (diff)
downloadforums-1be20d2e30ee621201752f78b8f232f424b81f4f.tar
forums-1be20d2e30ee621201752f78b8f232f424b81f4f.tar.gz
forums-1be20d2e30ee621201752f78b8f232f424b81f4f.tar.bz2
forums-1be20d2e30ee621201752f78b8f232f424b81f4f.tar.xz
forums-1be20d2e30ee621201752f78b8f232f424b81f4f.zip
again... ie6 is still not behaving correctly... the pragma header invalidates the content. I hope this is really the cause now. :/
git-svn-id: file:///svn/phpbb/trunk@8054 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/style.php')
-rw-r--r--phpBB/style.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/style.php b/phpBB/style.php
index 7560a93dff..f177d30c03 100644
--- a/phpBB/style.php
+++ b/phpBB/style.php
@@ -174,8 +174,6 @@ if ($id)
}
}
- header('Content-type: text/css; charset=UTF-8');
-
if ($recache)
{
include_once($phpbb_root_path . 'includes/acp/acp_styles.' . $phpEx);
@@ -199,15 +197,15 @@ if ($id)
// Only set the expire time if the theme changed data is older than 30 minutes - to cope with changes from the ACP
if ($recache || $theme['theme_mtime'] > (time() - 1800))
{
- header('Cache-Control: private, no-cache="set-cookie"');
header('Expires: 0');
- header('Pragma: no-cache');
}
else
{
header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + $expire_time));
}
+ header('Content-type: text/css; charset=UTF-8');
+
// Parse Theme Data
$replace = array(
'{T_THEME_PATH}' => "{$phpbb_root_path}styles/" . $theme['theme_path'] . '/theme',