summaryrefslogtreecommitdiffstats
path: root/application/config
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@server-speed.net>2011-04-10 10:39:31 +0200
committerFlorian Pritz <bluewind@server-speed.net>2011-04-10 10:39:31 +0200
commit1bdc9c8903eb2db33fdb8174d61e15100dfbbca8 (patch)
treeb0c645ad99e04f34817fc4e6385792111db42274 /application/config
parent413d0cdac49257089a0790f6ac92973a36a6b69f (diff)
update to CI 2.0.2
Signed-off-by: Florian Pritz <bluewind@server-speed.net>
Diffstat (limited to 'application/config')
-rwxr-xr-xapplication/config/example/config.php8
-rwxr-xr-xapplication/config/example/database.php3
-rwxr-xr-xapplication/config/example/mimes.php5
-rwxr-xr-xapplication/config/example/routes.php1
4 files changed, 11 insertions, 6 deletions
diff --git a/application/config/example/config.php b/application/config/example/config.php
index f7edc7bf6..f2d3b9b5b 100755
--- a/application/config/example/config.php
+++ b/application/config/example/config.php
@@ -262,11 +262,13 @@ $config['sess_time_to_update'] = 300;
| 'cookie_prefix' = Set a prefix if you need to avoid collisions
| 'cookie_domain' = Set to .your-domain.com for site-wide cookies
| 'cookie_path' = Typically will be a forward slash
+| 'cookie_secure' = Cookies will only be set if a secure HTTPS connection exists.
|
*/
-$config['cookie_prefix'] = '';
-$config['cookie_domain'] = '';
-$config['cookie_path'] = '/';
+$config['cookie_prefix'] = "";
+$config['cookie_domain'] = "";
+$config['cookie_path'] = "/";
+$config['cookie_secure'] = FALSE;
/*
|--------------------------------------------------------------------------
diff --git a/application/config/example/database.php b/application/config/example/database.php
index 4bf16f591..32a4d7e11 100755
--- a/application/config/example/database.php
+++ b/application/config/example/database.php
@@ -53,6 +53,9 @@ $db['default']['cache_on'] = FALSE;
$db['default']['cachedir'] = "";
$db['default']['char_set'] = "utf8";
$db['default']['dbcollat'] = "utf8_bin";
+$db['default']['swap_pre'] = '';
+$db['default']['autoinit'] = TRUE;
+$db['default']['stricton'] = FALSE;
/* End of file database.php */
diff --git a/application/config/example/mimes.php b/application/config/example/mimes.php
index de923c45a..8065794ff 100755
--- a/application/config/example/mimes.php
+++ b/application/config/example/mimes.php
@@ -56,7 +56,7 @@ $mimes = array( 'hqx' => 'application/mac-binhex40',
'midi' => 'audio/midi',
'mpga' => 'audio/mpeg',
'mp2' => 'audio/mpeg',
- 'mp3' => array('audio/mpeg', 'audio/mpg', 'audio/mpeg3'),
+ 'mp3' => array('audio/mpeg', 'audio/mpg', 'audio/mpeg3', 'audio/mp3'),
'aif' => 'audio/x-aiff',
'aiff' => 'audio/x-aiff',
'aifc' => 'audio/x-aiff',
@@ -97,7 +97,8 @@ $mimes = array( 'hqx' => 'application/mac-binhex40',
'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
'word' => array('application/msword', 'application/octet-stream'),
'xl' => 'application/excel',
- 'eml' => 'message/rfc822'
+ 'eml' => 'message/rfc822',
+ 'json' => array('application/json', 'text/json')
);
diff --git a/application/config/example/routes.php b/application/config/example/routes.php
index 58a6162f0..2697c6b11 100755
--- a/application/config/example/routes.php
+++ b/application/config/example/routes.php
@@ -39,7 +39,6 @@
*/
$route['default_controller'] = "file";
-$route['scaffolding_trigger'] = "";
$route['file/(:any)'] = "file/$1";
$route['(:any)'] = "file/index/$1";
$route['404_override'] = '';