mirror of
https://github.com/codeigniter4/CodeIgniter4.git
synced 2025-02-20 11:44:28 +08:00
fix: index.php and spark do not work
This commit is contained in:
parent
a3bccfb126
commit
10a60e03bb
@ -52,9 +52,16 @@ $paths = new Config\Paths();
|
||||
require_once $paths->systemDirectory . '/Config/DotEnv.php';
|
||||
(new CodeIgniter\Config\DotEnv($paths->appDirectory . '/../'))->load();
|
||||
|
||||
// DEFINE ENVIRONMENT
|
||||
if (! defined('ENVIRONMENT')) {
|
||||
$env = $_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT');
|
||||
define('ENVIRONMENT', ($env !== false) ? $env : 'production');
|
||||
unset($env);
|
||||
}
|
||||
|
||||
// LOAD ENVIRONMENT BOOTSTRAP
|
||||
if (is_file(APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php')) {
|
||||
require_once APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php';
|
||||
if (is_file($paths->appDirectory . '/Config/Boot/' . ENVIRONMENT . '.php')) {
|
||||
require_once $paths->appDirectory . '/Config/Boot/' . ENVIRONMENT . '.php';
|
||||
} else {
|
||||
header('HTTP/1.1 503 Service Unavailable.', true, 503);
|
||||
echo 'The application environment is not set correctly.';
|
||||
|
11
spark
11
spark
@ -80,9 +80,16 @@ $paths = new Config\Paths();
|
||||
require_once $paths->systemDirectory . '/Config/DotEnv.php';
|
||||
(new CodeIgniter\Config\DotEnv($paths->appDirectory . '/../'))->load();
|
||||
|
||||
// DEFINE ENVIRONMENT
|
||||
if (! defined('ENVIRONMENT')) {
|
||||
$env = $_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT');
|
||||
define('ENVIRONMENT', ($env !== false) ? $env : 'production');
|
||||
unset($env);
|
||||
}
|
||||
|
||||
// LOAD ENVIRONMENT BOOTSTRAP
|
||||
if (is_file(APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php')) {
|
||||
require_once APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php';
|
||||
if (is_file($paths->appDirectory . '/Config/Boot/' . ENVIRONMENT . '.php')) {
|
||||
require_once $paths->appDirectory . '/Config/Boot/' . ENVIRONMENT . '.php';
|
||||
} else {
|
||||
header('HTTP/1.1 503 Service Unavailable.', true, 503);
|
||||
echo 'The application environment is not set correctly.';
|
||||
|
@ -17,18 +17,6 @@ use Config\Modules;
|
||||
use Config\Paths;
|
||||
use Config\Services;
|
||||
|
||||
/*
|
||||
* ---------------------------------------------------------------
|
||||
* DEFINE ENVIRONMENT
|
||||
* ---------------------------------------------------------------
|
||||
*/
|
||||
|
||||
if (! defined('ENVIRONMENT')) {
|
||||
$env = $_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT');
|
||||
define('ENVIRONMENT', ($env !== false) ? $env : 'production');
|
||||
unset($env);
|
||||
}
|
||||
|
||||
/*
|
||||
* ---------------------------------------------------------------
|
||||
* SETUP OUR PATH CONSTANTS
|
||||
|
Loading…
x
Reference in New Issue
Block a user