diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-11 16:23:07 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-11 16:23:07 +0200 |
| commit | a6183c6484e871c11aecb372837a321b9645bd10 (patch) | |
| tree | cccfdbfade471675bb31f90a58c3340f65a158ac /phpBB/includes | |
| parent | d5363bd095219c6ca1e5b32efa2fa80239badd30 (diff) | |
| parent | 03667081e1d0a33e7867e9e261044369c45dd8ad (diff) | |
| download | forums-a6183c6484e871c11aecb372837a321b9645bd10.tar forums-a6183c6484e871c11aecb372837a321b9645bd10.tar.gz forums-a6183c6484e871c11aecb372837a321b9645bd10.tar.bz2 forums-a6183c6484e871c11aecb372837a321b9645bd10.tar.xz forums-a6183c6484e871c11aecb372837a321b9645bd10.zip | |
Merge remote-tracking branch 'marc/ticket/12386' into develop-ascraeus
* marc/ticket/12386:
[ticket/12386] Rename DEBUG_EXTRA to DEBUG_CONTAINER for more descriptive name
[ticket/12386] Add DEBUG_EXTRA again and use it for container creation
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_container.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_install.php | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php index 448cb0b7ed..4a01c934bf 100644 --- a/phpBB/includes/functions_container.php +++ b/phpBB/includes/functions_container.php @@ -239,7 +239,7 @@ function phpbb_create_dumped_container($config_file, array $extensions, array $p */ function phpbb_create_dumped_container_unless_debug($config_file, array $extensions, array $passes, $phpbb_root_path, $php_ext) { - $container_factory = defined('DEBUG') ? 'phpbb_create_compiled_container' : 'phpbb_create_dumped_container'; + $container_factory = defined('DEBUG_CONTAINER') ? 'phpbb_create_compiled_container' : 'phpbb_create_dumped_container'; return $container_factory($config_file, $extensions, $passes, $phpbb_root_path, $php_ext); } diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index 476535ae5b..4f8ec99d88 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -486,12 +486,14 @@ function adjust_language_keys_callback($matches) * @param array $data Array containing the database connection information * @param string $dbms The name of the DBAL class to use * @param bool $debug If the debug constants should be enabled by default or not +* @param bool $debug_container If the container should be compiled on +* every page load or not * @param bool $debug_test If the DEBUG_TEST constant should be added * NOTE: Only for use within the testing framework * * @return string The output to write to the file */ -function phpbb_create_config_file_data($data, $dbms, $debug = false, $debug_test = false) +function phpbb_create_config_file_data($data, $dbms, $debug = false, $debug_container = false, $debug_test = false) { $config_data = "<?php\n"; $config_data .= "// phpBB 3.1.x auto-generated configuration file\n// Do not change anything in this file!\n"; @@ -526,6 +528,15 @@ function phpbb_create_config_file_data($data, $dbms, $debug = false, $debug_test $config_data .= "// @define('DEBUG', true);\n"; } + if ($debug_container) + { + $config_data .= "@define('DEBUG_CONTAINER', true);\n"; + } + else + { + $config_data .= "// @define('DEBUG_CONTAINER', true);\n"; + } + if ($debug_test) { $config_data .= "@define('DEBUG_TEST', true);\n"; |