diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-12-11 21:31:27 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-01-09 15:35:17 +0100 |
| commit | 78349ed80f24cb61ad05f997e97d805cc5b0409f (patch) | |
| tree | a9daf2a506047e74c585beadf601ff697fd4f34a /phpBB/includes/functions_acp.php | |
| parent | f6524f4902bc843908ade3583d5453ce58b5327a (diff) | |
| download | forums-78349ed80f24cb61ad05f997e97d805cc5b0409f.tar forums-78349ed80f24cb61ad05f997e97d805cc5b0409f.tar.gz forums-78349ed80f24cb61ad05f997e97d805cc5b0409f.tar.bz2 forums-78349ed80f24cb61ad05f997e97d805cc5b0409f.tar.xz forums-78349ed80f24cb61ad05f997e97d805cc5b0409f.zip | |
[ticket/14306] Automatically enable a safe mode when container building fails
PHPBB3-14306
Diffstat (limited to 'phpBB/includes/functions_acp.php')
| -rw-r--r-- | phpBB/includes/functions_acp.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 4a52657023..803e4f5e54 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -26,7 +26,7 @@ function adm_page_header($page_title) { global $config, $db, $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. |