diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-09-17 19:51:57 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-09-17 19:51:57 +0200 |
| commit | 428e4925429e29670fe08634a8d05c2f08220e43 (patch) | |
| tree | 42db51953fc6a1d81bf4c79fa229aa6090be5ec4 /phpBB/includes/functions.php | |
| parent | f6ccb3078147a205ec447ae500579d6efe70d15c (diff) | |
| parent | 72012381048589108b2837cbd61091c7f22b986b (diff) | |
| download | forums-428e4925429e29670fe08634a8d05c2f08220e43.tar forums-428e4925429e29670fe08634a8d05c2f08220e43.tar.gz forums-428e4925429e29670fe08634a8d05c2f08220e43.tar.bz2 forums-428e4925429e29670fe08634a8d05c2f08220e43.tar.xz forums-428e4925429e29670fe08634a8d05c2f08220e43.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13044] Move GMT out of gmdate in functions_acp
[ticket/13044] Move GMT out of gmdate()
[ticket/13044] \G\M\T to GMT in whole project
[ticket/13044] move GMT string out of gmdate()
[ticket/13044] Correct Expires headers
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 7dfaea6f48..a61518401c 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -5062,7 +5062,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id = // application/xhtml+xml not used because of IE 'Content-type' => 'text/html; charset=UTF-8', 'Cache-Control' => 'private, no-cache="set-cookie"', - 'Expires' => '0', + 'Expires' => gmdate('D, d M Y H:i:s', time()) . ' GMT', 'Pragma' => 'no-cache', ); if (!empty($user->data['is_bot'])) |