blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-07 15:19:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
alex
2018-08-24 17:57:21 +02:00
parent 5e00044b56 56340e992f
commit 20e9e6966e
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/vilesci.config-default.inc.php
+3
View File
@@ -197,4 +197,7 @@ define('DVB_PORTAL', 'https://stubei-p.portal.at');
define('DVB_USERNAME','username');
// Passwort
define('DVB_PASSWORD','passwort');
define('CI_ENVIRONMENT', 'development'); // Code igniter environment variable
?>
index.ci.php
+8 -5
View File
@@ -55,6 +55,14 @@
*
*/
// Loads FHC config files
require_once 'config/global.config.inc.php';
require_once 'config/vilesci.config.inc.php';
// Check if the CI_ENVIRONMENT constants is set and eventually use it to set the CI_ENV environment variable
if (defined('CI_ENVIRONMENT')) $_SERVER['CI_ENV'] = CI_ENVIRONMENT;
// If the CI_ENV environment variable is not set then use "development" as default
define('ENVIRONMENT', isset($_SERVER['CI_ENV']) ? $_SERVER['CI_ENV'] : 'development');
/*
@@ -65,7 +73,6 @@ define('ENVIRONMENT', isset($_SERVER['CI_ENV']) ? $_SERVER['CI_ENV'] : 'developm
* Different environments will require different levels of error reporting.
* By default development will show errors but testing and live will hide them.
*/
switch (ENVIRONMENT)
{
case 'development':
@@ -299,10 +306,6 @@ switch (ENVIRONMENT)
*
*/
// First load the FHC-Config-Files ...
require_once 'config/global.config.inc.php';
require_once 'config/vilesci.config.inc.php';
// ... and the vendor autoload
include_once 'vendor/autoload.php';