From 37f4b9caa02783e06dd7c5318200113409a0deb1 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Fri, 1 Jul 2011 17:56:50 -0500
Subject: backed out 648b42a75739, which was a NON-trivial whitespace commit. 
 It broke the Typography class's string replacements, for instance

---
 system/core/Controller.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'system/core/Controller.php')

diff --git a/system/core/Controller.php b/system/core/Controller.php
index 107d3f346..ec86b7920 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.
@@ -49,7 +49,7 @@ class CI_Controller {
 		$this->load =& load_class('Loader', 'core');
 
 		$this->load->set_base_classes()->ci_autoloader();
-
+		
 		log_message('debug', "Controller Class Initialized");
 	}
 
-- 
cgit v1.2.3-24-g4f1b


From 6adfe636980da3a7b25e5b87ed8bcd1d008a1243 Mon Sep 17 00:00:00 2001
From: Shane Pearson <bubbafoley@gmail.com>
Date: Wed, 10 Aug 2011 16:42:53 -0500
Subject: Reset loaded files arrays in the Loader so the 404_override
 controller can access autoloaded libraries.

If a controller exists but a method is not found the current $CI
instance is unset and a new one is created for the 404 override
controller. Any autoloaded libraries will not be available to the 404
override controller because the Loader sees them as already have been
loaded. To fix this we need to reset the loader. I implemented it via an
initialize function that resets the loaded files arrays and then calls
the autoloader. This also simplifies things in CI_Controller because it
only has to call one loader function instead.
---
 system/core/Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/core/Controller.php')

diff --git a/system/core/Controller.php b/system/core/Controller.php
index ec86b7920..fddb81e19 100644
--- a/system/core/Controller.php
+++ b/system/core/Controller.php
@@ -48,7 +48,7 @@ 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");
 	}
-- 
cgit v1.2.3-24-g4f1b