summaryrefslogtreecommitdiffstats
path: root/application/config
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-01-05 17:33:12 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-01-05 17:33:12 +0100
commitc2e9225eec976326df36b666d6baf6db29eee831 (patch)
treeace703f9c298b2b1d5f9d1f8a2289b03b8de0212 /application/config
parent5e16ec6b33ed6a80bf511b2bf6eb4fc5a1103c94 (diff)
parent27324cd6ae2b076d3346e3585f312f7a61a5a897 (diff)
Automated merge with http://hg.ellislab.com/CodeIgniter-Reactor
Diffstat (limited to 'application/config')
-rw-r--r--application/config/config.php4
-rw-r--r--application/config/mimes.php2
2 files changed, 5 insertions, 1 deletions
diff --git a/application/config/config.php b/application/config/config.php
index 251f1aa3f..a844f71ab 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -137,6 +137,9 @@ $config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-';
| By default CodeIgniter uses search-engine friendly segment based URLs:
| example.com/who/what/where/
|
+| By default CodeIgniter enables access to the $_GET array. If for some
+| reason you would like to disable it, set 'allow_get_array' to FALSE.
+|
| You can optionally enable standard query string based URLs:
| example.com?who=me&what=something&where=here
|
@@ -151,6 +154,7 @@ $config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-';
| use segment based URLs.
|
*/
+$config['allow_get_array'] = TRUE;
$config['enable_query_strings'] = FALSE;
$config['controller_trigger'] = 'c';
$config['function_trigger'] = 'm';
diff --git a/application/config/mimes.php b/application/config/mimes.php
index f31fff2ec..3815a5aa9 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -10,7 +10,7 @@
$mimes = array( 'hqx' => 'application/mac-binhex40',
'cpt' => 'application/mac-compactpro',
- 'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'),
+ 'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'),
'bin' => 'application/macbinary',
'dms' => 'application/octet-stream',
'lha' => 'application/octet-stream',