From 1bdc9c8903eb2db33fdb8174d61e15100dfbbca8 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Sun, 10 Apr 2011 10:39:31 +0200 Subject: update to CI 2.0.2 Signed-off-by: Florian Pritz --- application/config/example/config.php | 8 +++++--- application/config/example/database.php | 3 +++ application/config/example/mimes.php | 5 +++-- application/config/example/routes.php | 1 - application/controllers/index.html | 0 application/errors/error_404.php | 2 +- application/errors/error_db.php | 2 +- application/errors/error_general.php | 2 +- application/errors/error_php.php | 0 application/errors/index.html | 0 application/helpers/index.html | 0 application/hooks/index.html | 0 application/index.html | 0 application/language/english/index.html | 0 application/libraries/index.html | 0 application/models/index.html | 0 application/views/index.html | 0 17 files changed, 14 insertions(+), 9 deletions(-) mode change 100644 => 100755 application/controllers/index.html mode change 100644 => 100755 application/errors/error_404.php mode change 100644 => 100755 application/errors/error_db.php mode change 100644 => 100755 application/errors/error_general.php mode change 100644 => 100755 application/errors/error_php.php mode change 100644 => 100755 application/errors/index.html mode change 100644 => 100755 application/helpers/index.html mode change 100644 => 100755 application/hooks/index.html mode change 100644 => 100755 application/index.html mode change 100644 => 100755 application/language/english/index.html mode change 100644 => 100755 application/libraries/index.html mode change 100644 => 100755 application/models/index.html mode change 100644 => 100755 application/views/index.html (limited to 'application') 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'] = ''; diff --git a/application/controllers/index.html b/application/controllers/index.html old mode 100644 new mode 100755 diff --git a/application/errors/error_404.php b/application/errors/error_404.php old mode 100644 new mode 100755 index 1c513a205..a304f4561 --- a/application/errors/error_404.php +++ b/application/errors/error_404.php @@ -21,7 +21,7 @@ h1 { font-weight: normal; font-size: 14px; color: #990000; -margin: 0 0 4px 0; +margin: 0 0 4px 0; } diff --git a/application/errors/error_db.php b/application/errors/error_db.php old mode 100644 new mode 100755 index 1ce52dfc9..181de960b --- a/application/errors/error_db.php +++ b/application/errors/error_db.php @@ -21,7 +21,7 @@ h1 { font-weight: normal; font-size: 14px; color: #990000; -margin: 0 0 4px 0; +margin: 0 0 4px 0; } diff --git a/application/errors/error_general.php b/application/errors/error_general.php old mode 100644 new mode 100755 index d8610702b..7734d34c7 --- a/application/errors/error_general.php +++ b/application/errors/error_general.php @@ -21,7 +21,7 @@ h1 { font-weight: normal; font-size: 14px; color: #990000; -margin: 0 0 4px 0; +margin: 0 0 4px 0; } diff --git a/application/errors/error_php.php b/application/errors/error_php.php old mode 100644 new mode 100755 diff --git a/application/errors/index.html b/application/errors/index.html old mode 100644 new mode 100755 diff --git a/application/helpers/index.html b/application/helpers/index.html old mode 100644 new mode 100755 diff --git a/application/hooks/index.html b/application/hooks/index.html old mode 100644 new mode 100755 diff --git a/application/index.html b/application/index.html old mode 100644 new mode 100755 diff --git a/application/language/english/index.html b/application/language/english/index.html old mode 100644 new mode 100755 diff --git a/application/libraries/index.html b/application/libraries/index.html old mode 100644 new mode 100755 diff --git a/application/models/index.html b/application/models/index.html old mode 100644 new mode 100755 diff --git a/application/views/index.html b/application/views/index.html old mode 100644 new mode 100755 -- cgit v1.2.3-24-g4f1b