diff options
| author | Ahmad Anbar <aanbar@gmail.com> | 2015-02-04 18:20:01 +0100 |
|---|---|---|
| committer | Ahmad Anbar <aanbar@gmail.com> | 2015-02-04 18:20:01 +0100 |
| commit | e5454f9b28f123a5549971f580255a065b2f8cc2 (patch) | |
| tree | c4927e7b7afb0bf242976034630cc60f2f1db00f /system/libraries/Upload.php | |
| parent | 6db62ab0ad0e223806a1367e12b1884b48dc65d7 (diff) | |
| parent | eccac6e6a73a4d1a5b40f383ce64359c2c94ae12 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'system/libraries/Upload.php')
| -rw-r--r-- | system/libraries/Upload.php | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index e022c43d4..f5534a7f7 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -296,7 +296,7 @@ class CI_Upload { $this->_mimes =& get_mimes(); $this->_CI =& get_instance(); - log_message('debug', 'Upload Class Initialized'); + log_message('info', 'Upload Class Initialized'); } // -------------------------------------------------------------------- @@ -338,11 +338,9 @@ class CI_Upload { $this->$key = $defaults[$key]; } } - } else { - foreach ($config as $key => &$value) { if ($key[0] !== '_' && $reflection->hasProperty($key)) @@ -357,7 +355,6 @@ class CI_Upload { } } } - } // if a file_name was provided in the config, use it instead of the user input @@ -1300,6 +1297,3 @@ class CI_Upload { } } - -/* End of file Upload.php */ -/* Location: ./system/libraries/Upload.php */
\ No newline at end of file |