diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-04-26 23:34:05 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-04-26 23:34:05 +0200 |
| commit | f59bb1ac944dfaed23150ffd452ce5bca9f5f5c0 (patch) | |
| tree | d48f5d570c9f1696997aabb863507d5854e8af50 /application/config | |
| parent | 96ddee29ef2d2deac9bfb91f7d508efca09ee70f (diff) | |
| parent | 8ebd1b7a21dec212be7ba0be51ce671f45b389ca (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patch
Diffstat (limited to 'application/config')
| -rw-r--r-- | application/config/database.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/application/config/database.php b/application/config/database.php index f08d88761..19498735c 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -46,7 +46,7 @@ | cubrid, interbase, mssql, mysql, mysqli, oci8, | odbc, pdo, postgre, sqlite, sqlite3, sqlsrv | ['dbprefix'] You can add an optional prefix, which will be added -| to the table name when using the Active Record class +| to the table name when using the Query Builder class | ['pconnect'] TRUE/FALSE - Whether to use a persistent connection | ['db_debug'] TRUE/FALSE - Whether database errors should be displayed. | ['cache_on'] TRUE/FALSE - Enables/disables query caching @@ -69,12 +69,12 @@ | The $active_group variable lets you choose which connection group to | make active. By default there is only one group (the 'default' group). | -| The $active_record variables lets you determine whether or not to load -| the active record class +| The $query_builder variables lets you determine whether or not to load +| the query builder class */ $active_group = 'default'; -$active_record = TRUE; +$query_builder = TRUE; $db['default'] = array( 'dsn' => '', |