summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorTaufan Aditya <toopay@taufanaditya.com>2012-04-04 21:47:11 +0200
committerTaufan Aditya <toopay@taufanaditya.com>2012-04-04 21:47:11 +0200
commit8b0aca770ad6089e759c22a6b69b97ba2623a195 (patch)
tree0a7ad9aaa2c0fe0ea6ee49347c76c6c13032ac12 /application
parentfd24fa614885d6c89e19aecb09ae97f95dd3db57 (diff)
parent13e749db5c3cbf2f951347829265c51f8f8ecc34 (diff)
Merge remote-tracking branch 'upstream/develop' into db-tests
Diffstat (limited to 'application')
-rw-r--r--application/config/database.php36
1 files changed, 19 insertions, 17 deletions
diff --git a/application/config/database.php b/application/config/database.php
index 744de0392..8c06dd2e6 100644
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -75,23 +75,25 @@
$active_group = 'default';
$active_record = TRUE;
-$db['default']['dsn'] = '';
-$db['default']['hostname'] = 'localhost';
-$db['default']['username'] = '';
-$db['default']['password'] = '';
-$db['default']['database'] = '';
-$db['default']['dbdriver'] = 'mysql';
-$db['default']['dbprefix'] = '';
-$db['default']['pconnect'] = FALSE;
-$db['default']['db_debug'] = TRUE;
-$db['default']['cache_on'] = FALSE;
-$db['default']['cachedir'] = '';
-$db['default']['char_set'] = 'utf8';
-$db['default']['dbcollat'] = 'utf8_general_ci';
-$db['default']['swap_pre'] = '';
-$db['default']['autoinit'] = TRUE;
-$db['default']['stricton'] = FALSE;
-$db['default']['failover'] = array();
+$db['default'] = array(
+ 'dsn' => '',
+ 'hostname' => 'localhost',
+ 'username' => '',
+ 'password' => '',
+ 'database' => '',
+ 'dbdriver' => 'mysqli',
+ 'dbprefix' => '',
+ 'pconnect' => FALSE,
+ 'db_debug' => TRUE,
+ 'cache_on' => FALSE,
+ 'cachedir' => '',
+ 'char_set' => 'utf8',
+ 'dbcollat' => 'utf8_general_ci',
+ 'swap_pre' => '',
+ 'autoinit' => TRUE,
+ 'stricton' => FALSE,
+ 'failover' => array()
+);
/* End of file database.php */
/* Location: ./application/config/database.php */ \ No newline at end of file