summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorJoseba Juániz <joseba.juaniz@gmail.com>2014-08-06 20:03:25 +0200
committerJoseba Juániz <joseba.juaniz@gmail.com>2014-08-06 20:03:25 +0200
commita8027ffc90ef80819fba01209fa57f810e2104af (patch)
treef48e33a561d82b7ecda273b4374829ce8b5f6bf8 /system/libraries
parent9b8286cf0320c8d8864ce4a5fc892c06787a9762 (diff)
Change name didn't work if reset initialization it's true
If user initializes the upload library with the reset flag as true, the uploaded file doesn't change it's name, it's neccesary to initialize or change the $_file_name_override every time.
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Upload.php25
1 files changed, 14 insertions, 11 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 75fc0624f..7946111cc 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -327,23 +327,26 @@ class CI_Upload {
$this->$key = $defaults[$key];
}
}
-
- return $this;
+
}
-
- foreach ($config as $key => &$value)
+ else
{
- if ($key[0] !== '_' && $reflection->hasProperty($key))
+
+ foreach ($config as $key => &$value)
{
- if ($reflection->hasMethod('set_'.$key))
- {
- $this->{'set_'.$key}($value);
- }
- else
+ if ($key[0] !== '_' && $reflection->hasProperty($key))
{
- $this->$key = $value;
+ if ($reflection->hasMethod('set_'.$key))
+ {
+ $this->{'set_'.$key}($value);
+ }
+ else
+ {
+ $this->$key = $value;
+ }
}
}
+
}
// if a file_name was provided in the config, use it instead of the user input