aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-11-20 18:38:32 +0100
committerTristan Darricau <github@nicofuma.fr>2014-11-20 21:13:30 +0100
commit93f61a4a7d34f8ad565bdc1605784284994ecdfc (patch)
tree082096bdf3994d6ffc0a87ebef1cd1097a568a01
parent48950be82bca0c85347f5aa1585de44c369780c6 (diff)
downloadforums-93f61a4a7d34f8ad565bdc1605784284994ecdfc.tar
forums-93f61a4a7d34f8ad565bdc1605784284994ecdfc.tar.gz
forums-93f61a4a7d34f8ad565bdc1605784284994ecdfc.tar.bz2
forums-93f61a4a7d34f8ad565bdc1605784284994ecdfc.tar.xz
forums-93f61a4a7d34f8ad565bdc1605784284994ecdfc.zip
[ticket/12620] Use the right environment while installing
PHPBB3-12620
-rw-r--r--phpBB/includes/functions_install.php14
1 files changed, 13 insertions, 1 deletions
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index ef4e3166e3..a60ddd40c5 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -450,7 +450,19 @@ function phpbb_create_config_file_data($data, $dbms, $debug = false, $debug_cont
$config_data .= "\n@define('PHPBB_INSTALLED', true);\n";
$config_data .= "// @define('PHPBB_DISPLAY_LOAD_TIME', true);\n";
- $config_data .= "@define('PHPBB_ENVIRONMENT', 'test');\n";
+
+ if ($debug_test)
+ {
+ $config_data .= "@define('PHPBB_ENVIRONMENT', 'test');\n";
+ }
+ else if ($debug)
+ {
+ $config_data .= "@define('PHPBB_ENVIRONMENT', 'development');\n";
+ }
+ else
+ {
+ $config_data .= "@define('PHPBB_ENVIRONMENT', 'production');\n";
+ }
if ($debug_container)
{