summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--system/core/URI.php7
-rw-r--r--tests/codeigniter/core/URI_test.php2
2 files changed, 2 insertions, 7 deletions
diff --git a/system/core/URI.php b/system/core/URI.php
index 1817374b7..067338d2a 100644
--- a/system/core/URI.php
+++ b/system/core/URI.php
@@ -327,12 +327,7 @@ class CI_URI {
show_error('The URI you submitted has disallowed characters.', 400);
}
- // Convert programatic characters to entities and return
- return str_replace(
- array('$', '(', ')', '%28', '%29'), // Bad
- array('$', '(', ')', '(', ')'), // Good
- $str
- );
+ return $str;
}
// --------------------------------------------------------------------
diff --git a/tests/codeigniter/core/URI_test.php b/tests/codeigniter/core/URI_test.php
index b05a385d6..4b1d644e3 100644
--- a/tests/codeigniter/core/URI_test.php
+++ b/tests/codeigniter/core/URI_test.php
@@ -138,7 +138,7 @@ class URI_test extends CI_TestCase {
$str = $this->uri->filter_uri('$destroy_app(foo)');
- $this->assertEquals($str, '$destroy_app(foo)');
+ $this->assertEquals($str, '$destroy_app(foo)');
}
// --------------------------------------------------------------------