From cef2106de1c7044072499aa5d4e529a01c3db8a4 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 30 Oct 2006 17:13:13 +0000 Subject: --- system/codeigniter/CodeIgniter.php | 4 +--- system/libraries/Controller.php | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'system') diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index fb27191ce..5b3f54ae3 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -115,11 +115,9 @@ $LANG =& load_class('Language'); * Note: The Loader class needs to be included first * */ - -load_class('Loader', FALSE); - if (floor(phpversion()) < 5) { + load_class('Loader', FALSE); require(BASEPATH.'codeigniter/Base4'.EXT); } else diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php index 922382ab7..c8fa646c7 100644 --- a/system/libraries/Controller.php +++ b/system/libraries/Controller.php @@ -74,11 +74,11 @@ class Controller extends CI_Base { $this->$var =& load_class($class); } - // In PHP 5 the Controller class is run as a discreet + // In PHP 5 the Loader class is run as a discreet // class. In PHP 4 it extends the Controller if (floor(phpversion()) >= 5) { - $this->load = new CI_Loader(); + $this->load =& load_class('Loader'); $this->load->_ci_autoloader(); } else -- cgit v1.2.3-24-g4f1b