summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHunter Wu <hunter.wu@gmail.com>2013-08-04 06:31:52 +0200
committerHunter Wu <hunter.wu@gmail.com>2013-08-04 06:31:52 +0200
commit4495cc740c1c0e382cc62d3d174abd17c0b4d84f (patch)
tree6af7eeb78fdef0681d8215d44124c79e0395f8a8
parenta8d6d3b13a0086c86e3dd69f0376be3a6982bc16 (diff)
Rename bad chars property to filename_bad_chars, remove the setter and add changelog entry
-rw-r--r--system/core/Security.php17
-rw-r--r--user_guide_src/source/changelog.rst1
2 files changed, 3 insertions, 15 deletions
diff --git a/system/core/Security.php b/system/core/Security.php
index 3d04d5e12..70cf3e013 100644
--- a/system/core/Security.php
+++ b/system/core/Security.php
@@ -42,7 +42,7 @@ class CI_Security {
*
* @var array
*/
- public $sanitize_filename_str = array(
+ public $filename_bad_chars = array(
'../', '<!--', '-->', '<', '>',
"'", '"', '&', '$', '#',
'{', '}', '[', ']', '=',
@@ -565,19 +565,6 @@ class CI_Security {
// --------------------------------------------------------------------
/**
- * Set Sanitize Filename Strings
- *
- * @param array $strings
- * @return void
- */
- public function set_sanitize_filename_str($strings)
- {
- $this->sanitize_filename_str = $strings;
- }
-
- // --------------------------------------------------------------------
-
- /**
* Sanitize Filename
*
* @param string $str Input file name
@@ -586,7 +573,7 @@ class CI_Security {
*/
public function sanitize_filename($str, $relative_path = FALSE)
{
- $bad = $this->sanitize_filename_str;
+ $bad = $this->filename_bad_chars;
if ( ! $relative_path)
{
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 4cef0e683..fd1ce2dc0 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -416,6 +416,7 @@ Release Date: Not Released
- Added method ``strip_image_tags()``.
- Added ``$config['csrf_regeneration']``, which makes token regeneration optional.
- Added ``$config['csrf_exclude_uris']``, which allows you list URIs which will not have the CSRF validation methods run.
+ - Changed ``sanitize_filename()``, makes filename_bad_chars a public property.
- :doc:`URI Routing <general/routing>` changes include: