summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-06-15 22:44:48 +0200
committerAndrey Andreev <narf@bofh.bg>2012-06-15 22:44:48 +0200
commit58ae971ba248cf3e32a139088c3833c9735028de (patch)
tree14e68e4a7d82567f310edb4d527000d586b08769 /system/core
parentd1a075d7807ad8177ecb4235dfe16ffe2041f860 (diff)
Fix issue #167
Diffstat (limited to 'system/core')
-rw-r--r--system/core/URI.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/URI.php b/system/core/URI.php
index a997525ee..208d311a5 100644
--- a/system/core/URI.php
+++ b/system/core/URI.php
@@ -278,7 +278,7 @@ class CI_URI {
{
// preg_quote() in PHP 5.3 escapes -, so the str_replace() and addition of - to preg_quote() is to maintain backwards
// compatibility as many are unaware of how characters in the permitted_uri_chars will be parsed as a regex pattern
- if ( ! preg_match('|^['.str_replace(array('\\-', '\-'), '-', preg_quote($this->config->item('permitted_uri_chars'), '-')).']+$|i', $str))
+ if ( ! preg_match('|^['.str_replace(array('\\-', '\-'), '-', preg_quote($this->config->item('permitted_uri_chars'), '-')).']+$|i', urldecode($str)))
{
show_error('The URI you submitted has disallowed characters.', 400);
}