summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2008-02-18 21:54:15 +0100
committerDerek Jones <derek.jones@ellislab.com>2008-02-18 21:54:15 +0100
commit05a37a1ed0e12554e8d4fbd47712434853f7e6b2 (patch)
treec0e4532acb116bad6aa0d9373573213f238e039f
parent49c87240fe4c12da980b0615a5bb5741638596eb (diff)
Escaped the '-' in the default 'permitted_uri_chars' config item, as some developers just want to add characters to the pattern and do not have a good grasp of regular expressions.
-rw-r--r--system/application/config/config.php2
-rw-r--r--user_guide/changelog.html1
2 files changed, 2 insertions, 1 deletions
diff --git a/system/application/config/config.php b/system/application/config/config.php
index a02fed142..72d38199c 100644
--- a/system/application/config/config.php
+++ b/system/application/config/config.php
@@ -123,7 +123,7 @@ $config['subclass_prefix'] = 'MY_';
| DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!
|
*/
-$config['permitted_uri_chars'] = 'a-z 0-9~%.:_-';
+$config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-';
/*
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 6ea7d3a64..c245c73b5 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -89,6 +89,7 @@ Change Log
<li>Added $_SERVER, $_FILES, $_ENV, and $_SESSION to sanitization of globals.</li>
<li>Added a <a href="./helpers/path_helper.html">Path Helper</a>.</li>
<li>Simplified _reindex_segments() in the URI class</li>
+ <li>Escaped the '-' in the default 'permitted_uri_chars' config item, to prevent errors if developers just try to add additional characters to the end of the default expression.</li>
</ul>
</li>
</ul>