3 files changed, 9 insertions, 9 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;