diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-15 18:13:34 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-15 18:13:34 +0100 |
| commit | 8e584dfa6b139fb415e6c18e5daf8fe8f323a5ce (patch) | |
| tree | 3ad2843d95f952fe387837c182adbb43e59cbf73 /phpBB/includes | |
| parent | 97e002cc3dc9a19b1fca10109c61b3d4e66ef201 (diff) | |
| parent | 1e0340b0cf7cc34094e03985457f1aed2f60da36 (diff) | |
| download | forums-8e584dfa6b139fb415e6c18e5daf8fe8f323a5ce.tar forums-8e584dfa6b139fb415e6c18e5daf8fe8f323a5ce.tar.gz forums-8e584dfa6b139fb415e6c18e5daf8fe8f323a5ce.tar.bz2 forums-8e584dfa6b139fb415e6c18e5daf8fe8f323a5ce.tar.xz forums-8e584dfa6b139fb415e6c18e5daf8fe8f323a5ce.zip | |
Merge pull request #4077 from Nicofuma/ticket/14306
[ticket/14306] Automatically enable a safe mode when container building fails
Diffstat (limited to 'phpBB/includes')
| -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 3f64bc19f9..d710d984b7 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, $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. |