7 files changed, 24 insertions, 14 deletions

diff --git a/system/application/config/autoload.php b/system/application/config/autoload.php
index 915dcee12..fc9d43fb6 100644
--- a/system/application/config/autoload.php
+++ b/system/application/config/autoload.php
@@ -38,7 +38,7 @@
 |	$autoload['libraries'] = array('database', 'session', 'xmlrpc');
 */
 
-$autoload['libraries'] = array();
+$autoload['libraries'] = array('database', 'calendar', 'dbutil', 'dbexport');
 
 
 /*
diff --git a/system/application/config/config.php b/system/application/config/config.php
index a7b3204cc..12501e684 100644
--- a/system/application/config/config.php
+++ b/system/application/config/config.php
@@ -34,14 +34,14 @@ $config['index_page'] = "index.php";
 | URI string.  The default setting of "auto" works for most servers.
 | If your links do not seem to work, try one of the other delicious flavors:
 | 
-| 'auto'			Default - auto detects
-| 'path_info'		Uses the PATH_INFO 
-| 'query_string'	Uses the QUERY_STRING
-| 'orig_path_info'	Uses the ORIG_PATH_INFO 
-| 'request_uri'		Uses the REQUEST_URI
+| 'AUTO'			Default - auto detects
+| 'PATH_INFO'		Uses the PATH_INFO 
+| 'QUERY_STRING'	Uses the QUERY_STRING
+| 'REQUEST_URI'		Uses the REQUEST_URI
+| 'ORIG_PATH_INFO'	Uses the ORIG_PATH_INFO 
 |
 */
-$config['uri_protocol']	= "auto";
+$config['uri_protocol']	= "AUTO";
 
 /*
 |--------------------------------------------------------------------------
diff --git a/system/application/config/database.php b/system/application/config/database.php
index cf91844d1..204ef6894 100644
--- a/system/application/config/database.php
+++ b/system/application/config/database.php
@@ -32,9 +32,9 @@
 $active_group = "default";
 
 $db['default']['hostname'] = "localhost";
-$db['default']['username'] = "";
+$db['default']['username'] = "root";
 $db['default']['password'] = "";
-$db['default']['database'] = "";
+$db['default']['database'] = "test";
 $db['default']['dbdriver'] = "mysql";
 $db['default']['dbprefix'] = "";
 $db['default']['active_r'] = TRUE;
diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php
index a227066fc..05194503f 100644
--- a/system/codeigniter/CodeIgniter.php
+++ b/system/codeigniter/CodeIgniter.php
@@ -27,7 +27,7 @@
  * @link		http://www.codeigniter.com/user_guide/
  */
  
-define('APPVER', '1.4.1');
+define('APPVER', '1.5.0');
 
 /*
  * ------------------------------------------------------
diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php
index 3b4b09d6e..00e20c6c6 100644
--- a/system/database/DB_utility.php
+++ b/system/database/DB_utility.php
@@ -31,6 +31,12 @@ class CI_DB_utility {
 
 	var $db;
 
+	/**
+	 * Constructor
+	 *
+	 * Grabs the CI super object instance so we can access it.
+	 *
+	 */	
 	function CI_DB_utility()
 	{
 		// Assign the main database object to $this->db
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);
 
 // ------------------------------------------------------------------------