diff options
Diffstat (limited to 'application/config')
-rw-r--r-- | application/config/config.php | 3 | ||||
-rw-r--r-- | application/config/database.php | 5 | ||||
-rw-r--r-- | application/config/migration.php | 3 | ||||
-rw-r--r-- | application/config/user_agents.php | 1 |
4 files changed, 8 insertions, 4 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/migration.php b/application/config/migration.php index f56857401..4fb027b8e 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -90,5 +90,4 @@ $config['migration_version'] = 0; $config['migration_path'] = APPPATH . 'migrations/'; -/* End of file migration.php */ -/* Location: ./application/config/migration.php */
\ No newline at end of file +/* End of file migration.php */
\ No newline at end of file diff --git a/application/config/user_agents.php b/application/config/user_agents.php index 03cba9bc8..7f5fe810c 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -174,6 +174,7 @@ $mobiles = array( 'mobilexplorer' => "Mobile Explorer", 'operamini' => "Opera Mini", 'opera mini' => "Opera Mini", + 'opera mobi' => "Opera Mobile", // Other 'digital paths' => "Digital Paths", |