Split user config from application config
This commit is contained in:
parent
8f8c413927
commit
1ec7322b18
@ -41,6 +41,7 @@ function _dir()
|
||||
|
||||
// Define base directories
|
||||
$APP_DIR = _dir(__DIR__, 'app');
|
||||
$APPCONF_DIR = _dir($APP_DIR, 'appConf');
|
||||
$CONF_DIR = _dir($APP_DIR, 'config');
|
||||
|
||||
// Load composer autoloader
|
||||
@ -61,7 +62,7 @@ $whoops->register();
|
||||
// -----------------------------------------------------------------------------
|
||||
// Dependency Injection setup
|
||||
// -----------------------------------------------------------------------------
|
||||
require _dir($CONF_DIR, 'base_config.php'); // $base_config
|
||||
require _dir($APPCONF_DIR, 'base_config.php'); // $base_config
|
||||
$di = require _dir($APP_DIR, 'bootstrap.php');
|
||||
|
||||
$config = loadToml($CONF_DIR);
|
||||
|
@ -160,7 +160,7 @@ class CSSMin extends BaseMin {
|
||||
// --------------------------------------------------------------------------
|
||||
|
||||
//Get config files
|
||||
$config = require('../app/config/minify_config.php');
|
||||
$config = require('../app/appConf/minify_config.php');
|
||||
$groups = require($config['css_groups_file']);
|
||||
|
||||
if ( ! array_key_exists($_GET['g'], $groups))
|
||||
|
@ -233,7 +233,7 @@ class JSMin extends BaseMin {
|
||||
// ! Start Minifying
|
||||
// --------------------------------------------------------------------------
|
||||
|
||||
$config = require_once('../app/config/minify_config.php');
|
||||
$config = require_once('../app/appConf/minify_config.php');
|
||||
$groups = require_once($config['js_groups_file']);
|
||||
$cache_dir = "{$config['js_root']}cache";
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user