Split application-specific settings from others

pull/112/head
Andriy Kushnir (Orhideous) 2016-10-14 22:34:08 +03:00
parent df6c0885f1
commit 4ab732d0a1
13 changed files with 4 additions and 4 deletions

View File

@ -17,7 +17,7 @@
set_include_path(get_include_path().PATH_SEPARATOR.dirname(__FILE__));
chdir(dirname(__FILE__));
require_once("./config/loader.php");
require_once("./settings/loader.php");
require_once(Config::Get('path.root.engine')."/classes/Engine.class.php");
$lang = Config::Get('locale.lang');

View File

@ -293,8 +293,8 @@ $config['misc']['simplify_comments_pagination'] = false;
$config['page']['show_block_structure'] = false;
// Include configs
foreach (glob("config/configs/*") as $file) {
$name = explode('.', str_replace('config/configs/', '', $file));
foreach (glob("settings/parts.d/*") as $file) {
$name = explode('.', str_replace('settings/parts.d/', '', $file));
array_pop($name); // Remove extension
$conf = &$config;

View File

@ -19,7 +19,7 @@
* Operations with Config object
*/
require_once(dirname(dirname(__FILE__)) . "/engine/lib/internal/ConfigSimple/Config.class.php");
Config::LoadFromFile(dirname(__FILE__) . '/config.php');
Config::LoadFromFile(dirname(__FILE__) . '/application.php');
/**
* Инклудим все *.php файлы из каталога {path.root.engine}/include/ - это файлы ядра