mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge pull request #4077 from Nicofuma/ticket/14306

Browse Source 
[ticket/14306] Automatically enable a safe mode when container building fails
This commit is contained in:
Marc Alexander
2016-01-15 18:13:34 +01:00
parent 97e002cc3d 1e0340b0cf
commit 8e584dfa6b
4 changed files with 106 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/functions_acp.php
View File

@@ -26,7 +26,7 @@ function adm_page_header($page_title)
{
global $config, $user, $template;
global $phpbb_root_path, $phpbb_admin_path, $phpEx, $SID, $_SID;
global $phpbb_dispatcher;
global $phpbb_dispatcher, $phpbb_container;
if (defined('HEADER_INC'))
{
@@ -105,6 +105,8 @@ function adm_page_header($page_title)
'S_CONTENT_ENCODING' => 'UTF-8',
'S_CONTENT_FLOW_BEGIN' => ($user->lang['DIRECTION'] == 'ltr') ? 'left' : 'right',
'S_CONTENT_FLOW_END' => ($user->lang['DIRECTION'] == 'ltr') ? 'right' : 'left',
'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.