New var name to make it more comprehensive
Changes to follow the styleguide, proposed by narfbg (thanks to him)
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 14863d6..5861df5 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -140,7 +140,7 @@
*
* @var string
*/
- public $file_ext_case = FALSE;
+ public $file_ext_tolower = FALSE;
/**
* Upload path
@@ -301,7 +301,7 @@
'file_type' => '',
'file_size' => NULL,
'file_ext' => '',
- 'file_ext_case' => FALSE,
+ 'file_ext_tolower' => FALSE,
'upload_path' => '',
'overwrite' => FALSE,
'encrypt_name' => FALSE,
@@ -974,10 +974,13 @@
{
$x = explode('.', $filename);
- if($this->file_ext_case)
- return (count($x) !== 1) ? '.'.strtolower(end($x)) : '';
- else
- return (count($x) !== 1) ? '.'.end($x) : '';
+ if (count($x) === 1)
+ {
+ return '';
+ }
+
+ $ext = ($this->file_ext_tolower) ? strtolower(end($x)) : end($x);
+ return '.'.$ext;
}
// --------------------------------------------------------------------
@@ -1296,4 +1299,4 @@
}
/* End of file Upload.php */
-/* Location: ./system/libraries/Upload.php */
+/* Location: ./system/libraries/Upload.php */
\ No newline at end of file