summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorHunter Wu <hunter.wu@gmail.com>2013-08-03 16:36:05 +0200
committerHunter Wu <hunter.wu@gmail.com>2013-08-03 16:36:05 +0200
commit8df3352dff5f734c1b3831fdc131f676a9850d51 (patch)
tree5c042e2c9b78dee17dbaa967c891e4ff5923ee8c /system/libraries
parent23719ab569c9c8d6b791f65d7861daba3895ddcb (diff)
Revert "Add windows filename rule as an option for upload files"
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Upload.php12
1 files changed, 2 insertions, 10 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 62eca6fdb..85428044d 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -143,13 +143,6 @@ class CI_Upload {
public $file_ext_tolower = FALSE;
/**
- * Filename Rule
- *
- * @var string
- */
- public $filename_rule = 'default';
-
- /**
* Upload path
*
* @var string
@@ -322,8 +315,7 @@ class CI_Upload {
'detect_mime' => TRUE,
'xss_clean' => FALSE,
'temp_prefix' => 'temp_file_',
- 'client_name' => '',
- 'filename_rule' => 'default',
+ 'client_name' => ''
);
foreach ($defaults as $key => $val)
@@ -480,7 +472,7 @@ class CI_Upload {
// Sanitize the file name for security
$CI =& get_instance();
- $this->file_name = $CI->security->sanitize_filename($this->file_name, FALSE, $this->filename_rule);
+ $this->file_name = $CI->security->sanitize_filename($this->file_name);
// Truncate the file name if it's too long
if ($this->max_filename > 0)