diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-10-12 19:51:39 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-10-12 19:51:39 +0200 |
| commit | f83c4363b5459d294255e3817a230258861ec79b (patch) | |
| tree | e88929ac21246cab365d865ccc82aed56663a414 /system/database/DB_driver.php | |
| parent | a23e10fd2369cc85c4b942c5de6a8cf05a5b2b67 (diff) | |
| parent | 98ebf4351f8aad58504cd7318ddd94faf0dec482 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into feature/db_qb_aliasing
Diffstat (limited to 'system/database/DB_driver.php')
| -rw-r--r-- | system/database/DB_driver.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 02c64f9f1..b7b19d207 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -51,7 +51,7 @@ abstract class CI_DB_driver { public $char_set = 'utf8'; public $dbcollat = 'utf8_general_ci'; public $autoinit = TRUE; // Whether to automatically initialize the DB - public $compress = TRUE; + public $encrypt = FALSE; public $swap_pre = ''; public $port = ''; public $pconnect = FALSE; |