Commit 981893ac by 冷斌

fix bug

parent 47bc21a2
...@@ -52,6 +52,9 @@ class Upload { ...@@ -52,6 +52,9 @@ class Upload {
/* 获取配置 */ /* 获取配置 */
$this->config = array_merge($this->config, $config); $this->config = array_merge($this->config, $config);
var_dump($this->config );
die;
/* 设置上传驱动 */ /* 设置上传驱动 */
$this->setDriver($driver, $driverConfig); $this->setDriver($driver, $driverConfig);
...@@ -85,7 +88,7 @@ class Upload { ...@@ -85,7 +88,7 @@ class Upload {
if($name == 'driverConfig'){ if($name == 'driverConfig'){
//改变驱动配置后重置上传驱动 //改变驱动配置后重置上传驱动
//注意:必须选改变驱动然后再改变驱动配置 //注意:必须选改变驱动然后再改变驱动配置
$this->setDriver(); $this->setDriver();
} }
} }
} }
...@@ -143,7 +146,7 @@ class Upload { ...@@ -143,7 +146,7 @@ class Upload {
$finfo = finfo_open ( FILEINFO_MIME_TYPE ); $finfo = finfo_open ( FILEINFO_MIME_TYPE );
} }
// 对上传文件数组信息处理 // 对上传文件数组信息处理
$files = $this->dealFiles($files); $files = $this->dealFiles($files);
foreach ($files as $key => $file) { foreach ($files as $key => $file) {
$file['name'] = strip_tags($file['name']); $file['name'] = strip_tags($file['name']);
if(!isset($file['key'])) $file['key'] = $key; if(!isset($file['key'])) $file['key'] = $key;
...@@ -248,7 +251,7 @@ class Upload { ...@@ -248,7 +251,7 @@ class Upload {
/** /**
* 设置上传驱动 * 设置上传驱动
* @param string $driver 驱动名称 * @param string $driver 驱动名称
* @param array $config 驱动配置 * @param array $config 驱动配置
*/ */
private function setDriver($driver = null, $config = null){ private function setDriver($driver = null, $config = null){
$driver = $driver ? : ($this->driver ? : C('FILE_UPLOAD_TYPE')); $driver = $driver ? : ($this->driver ? : C('FILE_UPLOAD_TYPE'));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment