Merge branch 'develop' into feature/unit-tests

Conflicts:
	.hgignore

1 files changed, 4 insertions, 4 deletions

diff --git a/system/core/Controller.php b/system/core/Controller.php
index 107d3f346..fddb81e19 100644
--- a/system/core/Controller.php
+++ b/system/core/Controller.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * CodeIgniter
  *
@@ -37,7 +37,7 @@ class CI_Controller {
 	public function __construct()
 	{
 		self::$instance =& $this;
-
+		
 		// Assign all the class objects that were instantiated by the
 		// bootstrap file (CodeIgniter.php) to local class variables
 		// so that CI can run as one big super object.
@@ -48,8 +48,8 @@ class CI_Controller {
 
 		$this->load =& load_class('Loader', 'core');
 
-		$this->load->set_base_classes()->ci_autoloader();
-
+		$this->load->initialize();
+		
 		log_message('debug', "Controller Class Initialized");
 	}