diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-01-15 14:51:08 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-01-15 14:51:08 +0100 |
| commit | de14aa5a29b1b122bfd536f979dfda7f2fd9f53d (patch) | |
| tree | 7f2973fed092400b14f48ba12a95837571441c33 /system/core/Router.php | |
| parent | 3d215207ceff44193e3c1888b868fc3f691718c0 (diff) | |
CI_URI changes related to the 'permitted_uri_chars' setting
- Initialize and cache the value in the class constructor instead of searching for it every time
- Removed the preg_quote() call from _filter_uri() to allow more fine-tuning from configuration
- Renamed _filter_uri() to filter_uri() - it was public anyway and using it cannot break anything
Related: issue #2799
Diffstat (limited to 'system/core/Router.php')
| -rw-r--r-- | system/core/Router.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/core/Router.php b/system/core/Router.php index cb44a3ce9..71530ff07 100644 --- a/system/core/Router.php +++ b/system/core/Router.php @@ -154,16 +154,16 @@ class CI_Router { { if (isset($_GET[$this->config->item('directory_trigger')]) && is_string($_GET[$this->config->item('directory_trigger')])) { - $this->set_directory(trim($this->uri->_filter_uri($_GET[$this->config->item('directory_trigger')]))); + $this->set_directory(trim($this->uri->filter_uri($_GET[$this->config->item('directory_trigger')]))); $segments[] = $this->directory; } - $this->set_class(trim($this->uri->_filter_uri($_GET[$this->config->item('controller_trigger')]))); + $this->set_class(trim($this->uri->filter_uri($_GET[$this->config->item('controller_trigger')]))); $segments[] = $this->class; if ( ! empty($_GET[$this->config->item('function_trigger')]) && is_string($_GET[$this->config->item('function_trigger')])) { - $this->set_method(trim($this->uri->_filter_uri($_GET[$this->config->item('function_trigger')]))); + $this->set_method(trim($this->uri->filter_uri($_GET[$this->config->item('function_trigger')]))); $segments[] = $this->method; } } |