diff options
| author | Greg Aker <greg@gregaker.net> | 2011-12-25 08:44:33 +0100 |
|---|---|---|
| committer | Greg Aker <greg@gregaker.net> | 2011-12-25 08:44:33 +0100 |
| commit | ef38f0a6d83025fbd99ace5ec60311acfe9121c4 (patch) | |
| tree | 1728bc5df9412d8eccc2919bf3cd3f6bbe6a52d0 /application | |
| parent | d90e1a0fb541ee94459a20cf8b0726aebaec9692 (diff) | |
| parent | a96ade374f28cdae97036fc253fd8b2a0e8dc81a (diff) | |
Merge branch 'develop' into feature/unit-tests
Diffstat (limited to 'application')
| -rw-r--r-- | application/config/config.php | 3 | ||||
| -rw-r--r-- | application/config/database.php | 5 | ||||
| -rw-r--r-- | application/config/user_agents.php | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/application/config/config.php b/application/config/config.php index 808cc33bd..063c3d5d1 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -253,6 +253,9 @@ $config['cache_path'] = ''; | | If you use the Encryption class or the Session class you | MUST set an encryption key. See the user guide for info. +| +| http://codeigniter.com/user_guide/libraries/encryption.html +| http://codeigniter.com/user_guide/libraries/sessions.html | */ $config['encryption_key'] = ''; diff --git a/application/config/database.php b/application/config/database.php index 28b792f75..880773d80 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -41,7 +41,7 @@ | ['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. ie: mysql. Currently supported: +| ['dbdriver'] The database type. e.g.: mysql. Currently supported: mysql, mysqli, pdo, postgre, odbc, mssql, sqlite, oci8 | ['dbprefix'] You can add an optional prefix, which will be added | to the table name when using the Active Record class @@ -62,6 +62,7 @@ | ['autoinit'] Whether or not to automatically initialize the database. | ['stricton'] TRUE/FALSE - forces 'Strict Mode' connections | - good for ensuring strict SQL while developing +| ['failover'] array - A array with 0 or more data for connections if the main should fail. | | The $active_group variable lets you choose which connection group to | make active. By default there is only one group (the 'default' group). @@ -88,7 +89,7 @@ $db['default']['dbcollat'] = 'utf8_general_ci'; $db['default']['swap_pre'] = ''; $db['default']['autoinit'] = TRUE; $db['default']['stricton'] = FALSE; - +$db['default']['failover'] = array(); /* End of file database.php */ /* Location: ./application/config/database.php */
\ No newline at end of file diff --git a/application/config/user_agents.php b/application/config/user_agents.php index c3c7eaecb..7f5fe810c 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -174,7 +174,7 @@ $mobiles = array( 'mobilexplorer' => "Mobile Explorer", 'operamini' => "Opera Mini", 'opera mini' => "Opera Mini", - 'opera mobi' => "Opera Mini", + 'opera mobi' => "Opera Mobile", // Other 'digital paths' => "Digital Paths", |