summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Controller.php4
-rw-r--r--system/libraries/Email.php8
2 files changed, 8 insertions, 4 deletions
diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index 9d858e6c2..23c050e18 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -82,8 +82,7 @@ class Controller extends CI_Base {
*/
function init_class($class, $varname = '', $params = NULL)
{
- // First figure out what variable we're going to
- // use to instantiate the class to
+ // First figure out what variable we're going to assign the class to
if ($varname == '')
{
$varname = ( ! is_null($this->_ci_last_handle)) ? $this->_ci_last_handle : strtolower(str_replace('CI_', '', $class));
@@ -156,7 +155,6 @@ class Controller extends CI_Base {
// $obj->init_class() so that the class can get instantiated.
// For backward compatibility we'll test for filenames that are
// both uppercase and lower.
-
foreach (array(ucfirst($class), $class) as $filename)
{
for ($i = 1; $i < 3; $i++)
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index c9b9365ec..fd3fb8f17 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -15,8 +15,14 @@
// INITIALIZE THE CLASS ---------------------------------------------------
+$config = array();
+if (file_exists(APPPATH.'config/email'.EXT))
+{
+ include_once(APPPATH.'config/email'.EXT);
+}
+
$obj =& get_instance();
-$obj->init_class('CI_Email');
+$obj->init_class('CI_Email', 'email', $config);
// ------------------------------------------------------------------------