diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-07-05 15:31:12 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-07-05 15:31:12 +0200 |
| commit | 92d18a7b6c46eadc9db58ca60ffce3980e2313ff (patch) | |
| tree | b0a869a5312279d65c3e920ffbf0b32344ab1d0f /application | |
| parent | d66872ae5d7cd4d2b531251a9c63528e81af3322 (diff) | |
| parent | 7ca36131d881d3f83a86d824263d4abd65439e12 (diff) | |
Merge upstream branch
Diffstat (limited to 'application')
| -rw-r--r-- | application/config/config.php | 6 | ||||
| -rw-r--r-- | application/config/database.php | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/application/config/config.php b/application/config/config.php index 726e3a71c..28fc406d1 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -300,9 +300,9 @@ $config['sess_time_to_update'] = 300; | 'cookie_httponly' = Cookie will only be accessible via HTTP(S) (no javascript) | */ -$config['cookie_prefix'] = ""; -$config['cookie_domain'] = ""; -$config['cookie_path'] = "/"; +$config['cookie_prefix'] = ''; +$config['cookie_domain'] = ''; +$config['cookie_path'] = '/'; $config['cookie_secure'] = FALSE; $config['cookie_httponly'] = FALSE; diff --git a/application/config/database.php b/application/config/database.php index cb6ebad10..bb0d87be0 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -42,8 +42,9 @@ | ['username'] The username used to connect to the database | ['password'] The password used to connect to the database | ['database'] The name of the database you want to connect to -| ['dbdriver'] The database type. e.g.: mysql. Currently supported: -| cubrid, interbase, mssql, mysql, mysqli, oci8, +| ['dbdriver'] The database driver. e.g.: mysqli. + Currently supported: +| cubrid, ibase, 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 Query Builder class |