2 files changed, 24 insertions, 5 deletions

diff --git a/system/application/config/config.php b/system/application/config/config.php
index 0ed58d940..fc4724010 100644
--- a/system/application/config/config.php
+++ b/system/application/config/config.php
@@ -147,9 +147,28 @@ $config['function_trigger'] = 'm';
 | Error Logging
 |--------------------------------------------------------------------------
 |
+<<<<<<< .mine
+| Options are "local" or "gmt".  This pref tells the system whether to use 
+| your server's local time as the master "now" reference, or convert it to 
+| GMT.  See the "date helper" page of the user guide for information 
+| regarding date handling.
+|
+*/
+$config['time_reference'] = 'local';
+
+/*
+|--------------------------------------------------------------------------
+| Error Logging Threshold
+|--------------------------------------------------------------------------
+|
+| If you have enabled error logging, you can set an error threshold to 
+| determine what gets logged. Threshold options are:
+=======
 | You can enable error logging by setting a threshold over zero. The
 | threshold determines what gets logged. Threshold options are:
-| 	
+>>>>>>> .r388
+|
+|	0 = Disables logging
 | 	0 = Error logging TURNED OFF
 |	1 = Error Messages (including PHP errors)
 |	2 = Debug Messages
@@ -220,8 +239,8 @@ $config['encryption_key'] = "";
 $config['sess_cookie_name']		= 'ci_session';
 $config['sess_expiration']		= 7200;
 $config['sess_encrypt_cookie']	= FALSE;
-$config['sess_use_database']	= FALSE;
-$config['sess_table_name']		= '';
+$config['sess_use_database']	= TRUE;
+$config['sess_table_name']		= 'ci_sessions';
 $config['sess_match_ip']		= TRUE;
 $config['sess_match_useragent']	= TRUE;
 
diff --git a/system/application/config/database.php b/system/application/config/database.php
index b3246b6ec..5cfd76347 100644
--- a/system/application/config/database.php
+++ b/system/application/config/database.php
@@ -36,13 +36,13 @@ $active_group = "default";
 $db['default']['hostname'] = "localhost";
 $db['default']['username'] = "root";
 $db['default']['password'] = "";
-$db['default']['database'] = "tester";
+$db['default']['database'] = "test";
 $db['default']['dbdriver'] = "mysql";
 $db['default']['dbprefix'] = "";
 $db['default']['active_r'] = TRUE;
 $db['default']['pconnect'] = TRUE;
 $db['default']['db_debug'] = TRUE;
-$db['default']['cache_on'] = TRUE;
+$db['default']['cache_on'] = FALSE;
 $db['default']['cachedir'] = APPPATH.'dbcache/';