From 2911a3037440399fc2e10bc62b41e23dc3fb67ba Mon Sep 17 00:00:00 2001 From: WuXiangJun Date: Thu, 28 Feb 2019 14:47:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E5=8D=95=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=99=A8=E4=B8=AD=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/fast/Form.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extend/fast/Form.php b/extend/fast/Form.php index f9f4e748a..74cc43c75 100644 --- a/extend/fast/Form.php +++ b/extend/fast/Form.php @@ -922,7 +922,7 @@ EOD; $default = [ 'data-mimetype' => 'image/gif,image/jpeg,image/png,image/jpg,image/bmp' ]; - $uploadAttr = is_array($chooseAttr) ? array_merge($default, $uploadAttr) : $uploadAttr; + $uploadAttr = is_array($uploadAttr) ? array_merge($default, $uploadAttr) : $uploadAttr; $chooseAttr = is_array($chooseAttr) ? array_merge($default, $chooseAttr) : $chooseAttr; return $this->uploader($name, $value, $inputAttr, $uploadAttr, $chooseAttr, $previewAttr); } @@ -944,7 +944,7 @@ EOD; 'data-multiple' => 'true', 'data-mimetype' => 'image/gif,image/jpeg,image/png,image/jpg,image/bmp' ]; - $uploadAttr = is_array($chooseAttr) ? array_merge($default, $uploadAttr) : $uploadAttr; + $uploadAttr = is_array($uploadAttr) ? array_merge($default, $uploadAttr) : $uploadAttr; $chooseAttr = is_array($chooseAttr) ? array_merge($default, $chooseAttr) : $chooseAttr; return $this->uploader($name, $value, $inputAttr, $uploadAttr, $chooseAttr, $previewAttr); } @@ -981,7 +981,7 @@ EOD; $default = [ 'data-multiple' => 'true', ]; - $uploadAttr = is_array($chooseAttr) ? array_merge($default, $uploadAttr) : $uploadAttr; + $uploadAttr = is_array($uploadAttr) ? array_merge($default, $uploadAttr) : $uploadAttr; $chooseAttr = is_array($chooseAttr) ? array_merge($default, $chooseAttr) : $chooseAttr; return $this->uploader($name, $value, $inputAttr, $uploadAttr, $chooseAttr, $previewAttr); } -- Gitee