fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-06 02:01:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Load system configuration before Context::init()

Browse source
This commit is contained in:
Kijin Sung 2016-02-04 20:41:53 +09:00
parent 2cbecff729
commit 89db7c7c7c
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
classes/context/Context.class.php
View file

@ -460,7 +460,7 @@ class Context
// Load new configuration format. // Load new configuration format.
if ($config === null) if ($config === null)
{ {
$config = Rhymix\Framework\Config::init(); $config = Rhymix\Framework\Config::getAll();
} }
if (!count($config)) if (!count($config))
{ {

10
common/autoload.php
View file

@ -191,7 +191,9 @@ spl_autoload_register(function($class_name)
/** /**
* Also include the Composer autoloader. * Also include the Composer autoloader.
*/ */
if (file_exists(RX_BASEDIR . 'vendor/autoload.php')) require_once RX_BASEDIR . 'vendor/autoload.php';
{
require_once RX_BASEDIR . 'vendor/autoload.php'; /**
} * Load system configuration.
*/
Rhymix\Framework\Config::init();