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

[ticket/12386] Rename DEBUG_EXTRA to DEBUG_CONTAINER for more descriptive name

Browse source 
PHPBB3-12386
This commit is contained in:
Marc Alexander 2014-04-11 11:05:59 +02:00
parent 22090dc3a3
commit 03667081e1
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/functions_container.php
View file

@ -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_EXTRA') ? '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);
}

10
phpBB/includes/functions_install.php
View file

@ -486,14 +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_extra If the container should be compiled on
* @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_extra = 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";
@ -528,13 +528,13 @@ function phpbb_create_config_file_data($data, $dbms, $debug = false, $debug_extr
$config_data .= "// @define('DEBUG', true);\n";
}
if ($debug_extra)
if ($debug_container)
{
$config_data .= "@define('DEBUG_EXTRA', true);\n";
$config_data .= "@define('DEBUG_CONTAINER', true);\n";
}
else
{
$config_data .= "// @define('DEBUG_EXTRA', true);\n";
$config_data .= "// @define('DEBUG_CONTAINER', true);\n";
}
if ($debug_test)