diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-01-15 16:51:58 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-01-15 16:51:58 +0100 |
| commit | 60f71be48a6b91cc314908c3c0007f13e9cb2f0a (patch) | |
| tree | c7eb0d43c976984303886503781e0fcae0f0949a /application/config | |
| parent | 9916bfc126b0d6efa337740b263f123c5367fc55 (diff) | |
| parent | d8b1ad31cf7ee205ddf3cf396b1d1bfa45af49fa (diff) | |
Merge changes from develop
Diffstat (limited to 'application/config')
| -rw-r--r-- | application/config/config.php | 9 | ||||
| -rw-r--r-- | application/config/user_agents.php | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/application/config/config.php b/application/config/config.php index c46839330..ae748defd 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -141,15 +141,18 @@ $config['subclass_prefix'] = 'MY_'; | Allowed URL Characters |-------------------------------------------------------------------------- | -| This lets you specify with a regular expression which characters are permitted -| within your URLs. When someone tries to submit a URL with disallowed -| characters they will get a warning message. +| This lets you specify which characters are permitted within your URLs. +| When someone tries to submit a URL with disallowed characters they will +| get a warning message. | | As a security measure you are STRONGLY encouraged to restrict URLs to | as few characters as possible. By default only these are allowed: a-z 0-9~%.:_- | | Leave blank to allow all characters -- but only if you are insane. | +| The configured value is actually a regular expression character group +| and it will be executed as: ! preg_match('/^[<permitted_uri_chars>]+$/i +| | DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!! | */ diff --git a/application/config/user_agents.php b/application/config/user_agents.php index 2af70bf9c..819e42b69 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -90,6 +90,7 @@ $browsers = array( 'Opera' => 'Opera', 'MSIE' => 'Internet Explorer', 'Internet Explorer' => 'Internet Explorer', + 'Trident.* rv' => 'Internet Explorer', 'Shiira' => 'Shiira', 'Firefox' => 'Firefox', 'Chimera' => 'Chimera', |