From c22562f5cdb3db9482a7c6bc2398ebb12cbcfb8b Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Fri, 30 May 2014 14:57:19 +0200 Subject: [ticket/12620] Allow the user to define multiples environments PHPBB3-12620 --- phpBB/includes/functions_install.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/includes/functions_install.php') diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index 28cc603bdb..2be8e6e860 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -453,11 +453,11 @@ function phpbb_create_config_file_data($data, $dbms, $debug = false, $debug_cont if ($debug) { - $config_data .= "@define('DEBUG', true);\n"; + $config_data .= "@define('ENVIRONMENT', 'debug');\n"; } else { - $config_data .= "// @define('DEBUG', true);\n"; + $config_data .= "@define('ENVIRONMENT', 'productive');\n"; } if ($debug_container) -- cgit v1.2.1 From 70201ee8fa084da667b0b1a308d48d2f3c8a541b Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Fri, 30 May 2014 15:37:45 +0200 Subject: [ticket/12620] Rename debug to development PHPBB3-12620 --- phpBB/includes/functions_install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes/functions_install.php') diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index 2be8e6e860..1b63414cec 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -453,7 +453,7 @@ function phpbb_create_config_file_data($data, $dbms, $debug = false, $debug_cont if ($debug) { - $config_data .= "@define('ENVIRONMENT', 'debug');\n"; + $config_data .= "@define('ENVIRONMENT', 'development');\n"; } else { -- cgit v1.2.1 From c4842fe119a2947c3d6c34239f83d4d887a39f00 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Fri, 30 May 2014 16:18:11 +0200 Subject: [ticket/12620] Fix functional tests PHPBB3-12620 --- phpBB/includes/functions_install.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/includes/functions_install.php') diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index 1b63414cec..4ed44da0b1 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -472,6 +472,7 @@ function phpbb_create_config_file_data($data, $dbms, $debug = false, $debug_cont if ($debug_test) { $config_data .= "@define('DEBUG_TEST', true);\n"; + $config_data .= "@define('DEBUG', true);\n"; // Mandatory for the functional tests, will be removed by PHPBB3-12623 } return $config_data; -- cgit v1.2.1 From 7fa3b4c6860d85c7616e2182241eefe9515dc8a8 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Fri, 30 May 2014 18:33:56 +0200 Subject: [ticket/12620] Rename productive to production PHPBB3-12620 --- phpBB/includes/functions_install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes/functions_install.php') diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index 4ed44da0b1..e0ecda3bfa 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -457,7 +457,7 @@ function phpbb_create_config_file_data($data, $dbms, $debug = false, $debug_cont } else { - $config_data .= "@define('ENVIRONMENT', 'productive');\n"; + $config_data .= "@define('ENVIRONMENT', 'production');\n"; } if ($debug_container) -- cgit v1.2.1 From b697273aaa53d9f9f4a3d4a53cc6267e906953cd Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Thu, 4 Sep 2014 17:06:39 +0200 Subject: [ticket/12620] Use PHPBB_ENVIRONMENT PHPBB3-12620 --- phpBB/includes/functions_install.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/includes/functions_install.php') diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index e0ecda3bfa..cdd9c7864b 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -453,11 +453,11 @@ function phpbb_create_config_file_data($data, $dbms, $debug = false, $debug_cont if ($debug) { - $config_data .= "@define('ENVIRONMENT', 'development');\n"; + $config_data .= "@define('PHPBB_ENVIRONMENT', 'development');\n"; } else { - $config_data .= "@define('ENVIRONMENT', 'production');\n"; + $config_data .= "@define('PHPBB_ENVIRONMENT', 'production');\n"; } if ($debug_container) -- cgit v1.2.1 From 48950be82bca0c85347f5aa1585de44c369780c6 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Wed, 19 Nov 2014 20:54:14 +0100 Subject: [ticket/12620] Fix tests PHPBB3-12620 --- phpBB/includes/functions_install.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'phpBB/includes/functions_install.php') diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index cdd9c7864b..ef4e3166e3 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -450,15 +450,7 @@ 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"; - - if ($debug) - { - $config_data .= "@define('PHPBB_ENVIRONMENT', 'development');\n"; - } - else - { - $config_data .= "@define('PHPBB_ENVIRONMENT', 'production');\n"; - } + $config_data .= "@define('PHPBB_ENVIRONMENT', 'test');\n"; if ($debug_container) { -- cgit v1.2.1 From 93f61a4a7d34f8ad565bdc1605784284994ecdfc Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Thu, 20 Nov 2014 18:38:32 +0100 Subject: [ticket/12620] Use the right environment while installing PHPBB3-12620 --- phpBB/includes/functions_install.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'phpBB/includes/functions_install.php') 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) { -- cgit v1.2.1