diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-11-09 12:27:11 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-11-09 12:27:11 +0100 |
| commit | f2d92ea6cc175a43687665939b097cb6a9c79399 (patch) | |
| tree | 1987bcc874a4d6ff62de7d9276ba0f53d0957085 /system/core/CodeIgniter.php | |
| parent | 0bb08b7a7ab11b4cf655110a5bd17cf7fc61accb (diff) | |
Refactor CI_Config, CI_Hooks interaction (close #5323)
Diffstat (limited to 'system/core/CodeIgniter.php')
| -rw-r--r-- | system/core/CodeIgniter.php | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index c97ff2bbb..767e1a17a 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -143,20 +143,6 @@ defined('BASEPATH') OR exit('No direct script access allowed'); /* * ------------------------------------------------------ - * Instantiate the hooks class - * ------------------------------------------------------ - */ - $EXT =& load_class('Hooks', 'core'); - -/* - * ------------------------------------------------------ - * Is there a "pre_system" hook? - * ------------------------------------------------------ - */ - $EXT->call_hook('pre_system'); - -/* - * ------------------------------------------------------ * Instantiate the config class * ------------------------------------------------------ * @@ -178,6 +164,20 @@ defined('BASEPATH') OR exit('No direct script access allowed'); /* * ------------------------------------------------------ + * Instantiate the hooks class + * ------------------------------------------------------ + */ + $EXT =& load_class('Hooks', 'core', $CFG); + +/* + * ------------------------------------------------------ + * Is there a "pre_system" hook? + * ------------------------------------------------------ + */ + $EXT->call_hook('pre_system'); + +/* + * ------------------------------------------------------ * Important charset-related stuff * ------------------------------------------------------ * |