From f2d92ea6cc175a43687665939b097cb6a9c79399 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 9 Nov 2017 13:27:11 +0200 Subject: Refactor CI_Config, CI_Hooks interaction (close #5323) --- system/core/CodeIgniter.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'system/core/CodeIgniter.php') 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 @@ -141,20 +141,6 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $BM->mark('total_execution_time_start'); $BM->mark('loading_time:_base_classes_start'); -/* - * ------------------------------------------------------ - * Instantiate the hooks class - * ------------------------------------------------------ - */ - $EXT =& load_class('Hooks', 'core'); - -/* - * ------------------------------------------------------ - * Is there a "pre_system" hook? - * ------------------------------------------------------ - */ - $EXT->call_hook('pre_system'); - /* * ------------------------------------------------------ * Instantiate the config class @@ -176,6 +162,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 -- cgit v1.2.3-24-g4f1b