Refactor CI_Config, CI_Hooks interaction (close #5323)

2 files changed, 17 insertions, 17 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
  * ------------------------------------------------------
  *
diff --git a/system/core/Hooks.php b/system/core/Hooks.php
index f2d6f21ca..d21381f5e 100644
--- a/system/core/Hooks.php
+++ b/system/core/Hooks.php
@@ -83,16 +83,16 @@ class CI_Hooks {
 	/**
 	 * Class constructor
 	 *
+	 * @param	CI_Config	$config
 	 * @return	void
 	 */
-	public function __construct()
+	public function __construct(CI_Config $config)
 	{
-		$CFG =& load_class('Config', 'core');
 		log_message('info', 'Hooks Class Initialized');
 
 		// If hooks are not enabled in the config file
 		// there is nothing else to do
-		if ($CFG->item('enable_hooks') === FALSE)
+		if ($config->item('enable_hooks') === FALSE)
 		{
 			return;
 		}