Merge branch 'develop' into refactor/functions

This commit is contained in:
Kijin Sung 2016-01-09 15:18:40 +09:00
commit a3af9e66c9
16 changed files with 350 additions and 197 deletions

View file

@ -296,10 +296,7 @@ if((__DEBUG_OUTPUT__ == 2) && version_compare(PHP_VERSION, '6.0.0') === -1)
}
// Set Timezone as server time
if(version_compare(PHP_VERSION, '5.3.0') >= 0)
{
date_default_timezone_set(@date_default_timezone_get());
}
date_default_timezone_set(@date_default_timezone_get());
// Require a function-defined-file for simple use
require(_XE_PATH_ . 'config/func.inc.php');
@ -441,7 +438,8 @@ function __xe_autoload($class_name)
}
spl_autoload_register('__xe_autoload');
if(file_exists(_XE_PATH_ . '/vendor/autoload.php')) {
if(file_exists(_XE_PATH_ . '/vendor/autoload.php'))
{
require _XE_PATH_ . '/vendor/autoload.php';
}
/* End of file config.inc.php */