From 7cbd9e952472360f65f661d590bc95ce83a77458 Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Wed, 17 Sep 2014 11:15:24 +0200
Subject: [PATCH] [ticket/13044] move GMT string out of gmdate()

PHPBB3-13044
---
 phpBB/feed.php                        | 2 +-
 phpBB/includes/functions.php          | 2 +-
 phpBB/includes/functions_acp.php      | 2 +-
 phpBB/includes/functions_download.php | 4 ++--
 phpBB/install/index.php               | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/phpBB/feed.php b/phpBB/feed.php
index 68cb7b9844..d4dfb15928 100644
--- a/phpBB/feed.php
+++ b/phpBB/feed.php
@@ -164,7 +164,7 @@ if (defined('DEBUG') && request_var('explain', 0) && $auth->acl_get('a_'))
 {
 	header('Content-type: text/html; charset=UTF-8');
 	header('Cache-Control: private, no-cache="set-cookie"');
-	header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time()));
+	header('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
 	header('Pragma: no-cache');
 
 	$mtime = explode(' ', microtime());
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 3387943701..7a277055be 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' => gmdate('D, d M Y H:i:s \G\M\T', time()),
+		'Expires' => gmdate('D, d M Y H:i:s', time() . ' GMT'),
 		'Pragma' => 'no-cache',
 	);
 	if (!empty($user->data['is_bot']))
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index 63d13fb37c..85225e761a 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -112,7 +112,7 @@ function adm_page_header($page_title)
 		// application/xhtml+xml not used because of IE
 		'Content-type' => 'text/html; charset=UTF-8',
 		'Cache-Control' => 'private, no-cache="set-cookie"',
-		'Expires' => gmdate('D, d M Y H:i:s \G\M\T', time()),
+		'Expires' => gmdate('D, d M Y H:i:s', time() . ' GMT'),
 		'Pragma' => 'no-cache',
 	);
 
diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php
index 93f3951ad8..02dea6c113 100644
--- a/phpBB/includes/functions_download.php
+++ b/phpBB/includes/functions_download.php
@@ -56,7 +56,7 @@ function send_avatar_to_browser($file, $browser)
 
 			if (strpos(strtolower($browser), 'msie 6.0') !== false)
 			{
-				header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time()));
+				header('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
 			}
 			else
 			{
@@ -197,7 +197,7 @@ function send_file_to_browser($attachment, $upload_dir, $category)
 			header('Content-Disposition: attachment; ' . header_filename(htmlspecialchars_decode($attachment['real_filename'])));
 			if (empty($user->browser) || (strpos(strtolower($user->browser), 'msie 6.0') !== false))
 			{
-				header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time()));
+				header('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
 			}
 		}
 		else
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 7a2322629f..5531a98c09 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -445,7 +445,7 @@ class module
 
 		header('Content-type: text/html; charset=UTF-8');
 		header('Cache-Control: private, no-cache="set-cookie"');
-		header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time()));
+		header('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
 		header('Pragma: no-cache');
 
 		return;