diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-12-14 12:05:05 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-12-14 12:05:05 +0100 |
| commit | 867e8b56f752116fe1feae6c6db19020100458e3 (patch) | |
| tree | 0b25fcb5cb6f2b9580db61dbe4e76e7ba6255536 /application/config | |
| parent | 56d1efc5b14d7bd5a92800ba9394bf9201d48b61 (diff) | |
| parent | 25aab832ff5b064166b5af4f5c4269407c56b338 (diff) | |
Merge branch '3.1-stable' into develop
Diffstat (limited to 'application/config')
| -rw-r--r-- | application/config/config.php | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/application/config/config.php b/application/config/config.php index 0a7b8202b..c088e80c0 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -172,9 +172,6 @@ $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 | @@ -189,7 +186,6 @@ $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'; @@ -197,6 +193,20 @@ $config['directory_trigger'] = 'd'; /* |-------------------------------------------------------------------------- +| Allow $_GET array +|-------------------------------------------------------------------------- +| +| 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. +| +| WARNING: This feature is DEPRECATED and currently available only +| for backwards compatibility purposes! +| +*/ +$config['allow_get_array'] = TRUE; + +/* +|-------------------------------------------------------------------------- | Error Logging Threshold |-------------------------------------------------------------------------- | @@ -408,8 +418,8 @@ $config['cookie_httponly'] = FALSE; | Determines whether to standardize newline characters in input data, | meaning to replace \r\n, \r, \n occurrences with the PHP_EOL value. | -| This is particularly useful for portability between UNIX-based OSes, -| (usually \n) and Windows (\r\n). +| WARNING: This feature is DEPRECATED and currently available only +| for backwards compatibility purposes! | */ $config['standardize_newlines'] = FALSE; |