Reorder includes in autoload.php

- 사용자 환경설정(config.user.inc.php)을 로딩하기 전에 autoload 완료
- Object 클래스 로딩 위치 변경
This commit is contained in:
Kijin Sung 2017-12-04 20:53:42 +09:00
parent 44aea4301d
commit f97a16e7e8

View file

@ -41,15 +41,6 @@ if (function_exists('mb_regex_encoding'))
require_once __DIR__ . '/constants.php';
require_once __DIR__ . '/functions.php';
require_once __DIR__ . '/legacy.php';
require_once RX_BASEDIR . 'classes/object/Object.class.php';
/**
* Load user configuration.
*/
if(file_exists(RX_BASEDIR . 'config/config.user.inc.php'))
{
require_once RX_BASEDIR . 'config/config.user.inc.php';
}
/**
* Define the list of legacy class names for the autoloader.
@ -194,6 +185,19 @@ spl_autoload_register(function($class_name)
*/
require_once RX_BASEDIR . 'vendor/autoload.php';
/**
* Load essential classes.
*/
require_once RX_BASEDIR . 'classes/object/Object.class.php';
/**
* Load user configuration.
*/
if(file_exists(RX_BASEDIR . 'config/config.user.inc.php'))
{
require_once RX_BASEDIR . 'config/config.user.inc.php';
}
/**
* Load system configuration.
*/