diff options
| author | Ahmad Anbar <aanbar@gmail.com> | 2015-04-06 18:59:53 +0200 |
|---|---|---|
| committer | Ahmad Anbar <aanbar@gmail.com> | 2015-04-06 18:59:53 +0200 |
| commit | 5e50c42ef27261bc7fcb279499ce76cfc2519aa6 (patch) | |
| tree | d74d660534b72ddc0b6cda9147cecfb64a225346 /application/config/database.php | |
| parent | ed520408514fff6486788e1543589418d24d885e (diff) | |
| parent | 7726b75552f765af94038e47a4a4272ac08c646e (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'application/config/database.php')
| -rw-r--r-- | application/config/database.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/application/config/database.php b/application/config/database.php index 5ee2af438..925b3e504 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -39,7 +39,6 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | multi-byte character set and are running versions lower than these. | Sites using Latin-1 or UTF-8 database character set and collation are unaffected. | ['swap_pre'] A default table prefix that should be swapped with the dbprefix -| ['autoinit'] Whether or not to automatically initialize the database. | ['encrypt'] Whether or not to use an encrypted connection. | ['compress'] Whether or not to use client compression (MySQL only) | ['stricton'] TRUE/FALSE - forces 'Strict Mode' connections @@ -78,7 +77,6 @@ $db['default'] = array( 'char_set' => 'utf8', 'dbcollat' => 'utf8_general_ci', 'swap_pre' => '', - 'autoinit' => TRUE, 'encrypt' => FALSE, 'compress' => FALSE, 'stricton' => FALSE, |