From 6871d95930a148722f2b99fa80ef6dd44f86f078 Mon Sep 17 00:00:00 2001
From: admin <devnull@localhost>
Date: Wed, 4 Oct 2006 00:36:18 +0000
Subject:

---
 system/application/config/autoload.php |  2 +-
 system/application/config/config.php   |  2 +-
 system/application/config/database.php | 21 ++++++++++++++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

(limited to 'system/application')

diff --git a/system/application/config/autoload.php b/system/application/config/autoload.php
index 6a62cd652..06d8780c4 100644
--- a/system/application/config/autoload.php
+++ b/system/application/config/autoload.php
@@ -37,7 +37,7 @@
 |	$autoload['libraries'] = array('database', 'session', 'xmlrpc');
 */
 
-$autoload['libraries'] = array('database', 'calendar');
+$autoload['libraries'] = array();
 
 
 /*
diff --git a/system/application/config/config.php b/system/application/config/config.php
index 12501e684..31094f3b6 100644
--- a/system/application/config/config.php
+++ b/system/application/config/config.php
@@ -31,7 +31,7 @@ $config['index_page'] = "index.php";
 |--------------------------------------------------------------------------
 |
 | This item determines which server global should be used to retrieve the 
-| URI string.  The default setting of "auto" works for most servers.
+| 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
diff --git a/system/application/config/database.php b/system/application/config/database.php
index 5e6420831..7a5764d26 100644
--- a/system/application/config/database.php
+++ b/system/application/config/database.php
@@ -34,11 +34,30 @@ $active_group = "default";
 $db['default']['hostname'] = "localhost";
 $db['default']['username'] = "root";
 $db['default']['password'] = "";
-$db['default']['database'] = "tester";
+$db['default']['database'] = "ellislab";
 $db['default']['dbdriver'] = "mysql";
 $db['default']['dbprefix'] = "";
 $db['default']['active_r'] = TRUE;
 $db['default']['pconnect'] = FALSE;
 $db['default']['db_debug'] = TRUE;
+$db['default']['cache_on'] = TRUE;
+$db['default']['cachedir'] = APPPATH.'db_cache/';
+
+
+
+$db['test']['hostname'] = "localhost";
+$db['test']['username'] = "root";
+$db['test']['password'] = "";
+$db['test']['database'] = "exp4";
+$db['test']['dbdriver'] = "mysql";
+$db['test']['dbprefix'] = "";
+$db['test']['active_r'] = TRUE;
+$db['test']['pconnect'] = FALSE;
+$db['test']['db_debug'] = TRUE;
+
+
+
+
+
 
 ?>
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b