makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 20:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Derky 2019-07-30 07:40:18 +02:00
commit cebb6dc894
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/includes/functions.php
View file

@ -4574,12 +4574,13 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
if ($send_headers) if ($send_headers)
{ {
// An array of http headers that phpbb will set. The following event may override these. // An array of http headers that phpBB will set. The following event may override these.
$http_headers += array( $http_headers += array(
// application/xhtml+xml not used because of IE // application/xhtml+xml not used because of IE
'Content-type' => 'text/html; charset=UTF-8', 'Content-type' => 'text/html; charset=UTF-8',
'Cache-Control' => 'private, no-cache="set-cookie"', 'Cache-Control' => 'private, no-cache="set-cookie"',
'Expires' => gmdate('D, d M Y H:i:s', time()) . ' GMT', 'Expires' => gmdate('D, d M Y H:i:s', time()) . ' GMT',
'Referrer-Policy' => 'strict-origin-when-cross-origin',
); );
if (!empty($user->data['is_bot'])) if (!empty($user->data['is_bot']))
{ {

3
phpBB/includes/functions_acp.php
View file

@ -115,12 +115,13 @@ function adm_page_header($page_title)
'CONTAINER_EXCEPTION' => $phpbb_container->hasParameter('container_exception') ? $phpbb_container->getParameter('container_exception') : false, 'CONTAINER_EXCEPTION' => $phpbb_container->hasParameter('container_exception') ? $phpbb_container->getParameter('container_exception') : false,
)); ));
// An array of http headers that phpbb will set. The following event may override these. // An array of http headers that phpBB will set. The following event may override these.
$http_headers = array( $http_headers = array(
// application/xhtml+xml not used because of IE // application/xhtml+xml not used because of IE
'Content-type' => 'text/html; charset=UTF-8', 'Content-type' => 'text/html; charset=UTF-8',
'Cache-Control' => 'private, no-cache="set-cookie"', 'Cache-Control' => 'private, no-cache="set-cookie"',
'Expires' => gmdate('D, d M Y H:i:s', time()) . ' GMT', 'Expires' => gmdate('D, d M Y H:i:s', time()) . ' GMT',
'Referrer-Policy' => 'strict-origin-when-cross-origin',
); );
/** /**