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 /tests/mocks/core | |
| parent | 9916bfc126b0d6efa337740b263f123c5367fc55 (diff) | |
| parent | d8b1ad31cf7ee205ddf3cf396b1d1bfa45af49fa (diff) | |
Merge changes from develop
Diffstat (limited to 'tests/mocks/core')
| -rw-r--r-- | tests/mocks/core/uri.php | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/tests/mocks/core/uri.php b/tests/mocks/core/uri.php index 11078587b..96ec5afa1 100644 --- a/tests/mocks/core/uri.php +++ b/tests/mocks/core/uri.php @@ -10,12 +10,23 @@ class Mock_Core_URI extends CI_URI { // set predictable config values $test->ci_set_config(array( 'index_page' => 'index.php', - 'base_url' => 'http://example.com/', - 'subclass_prefix' => 'MY_' + 'base_url' => 'http://example.com/', + 'subclass_prefix' => 'MY_', + 'enable_query_strings' => FALSE, + 'permitted_uri_chars' => 'a-z 0-9~%.:_\-' )); $this->config = new $cls; + if ($this->config->item('enable_query_strings') !== TRUE OR is_cli()) + { + $this->_permitted_uri_chars = $this->config->item('permitted_uri_chars'); + } + } + + public function _set_permitted_uri_chars($value) + { + $this->_permitted_uri_chars = $value; } }
\ No newline at end of file |