diff --git a/application/common/controller/Upload.php b/application/common/controller/Upload.php index b59e0fc2..0d33405b 100644 --- a/application/common/controller/Upload.php +++ b/application/common/controller/Upload.php @@ -62,7 +62,8 @@ class Upload { public function editor() { $callback = request()->get('callback'); - $file = request()->file('upfile'); + $CKEditorFuncNum = request()->get('CKEditorFuncNum'); + $file = request()->file('upload'); $info = $file->move(config('editor_upload.rootPath'), true, false); if ($info) { $fileInfo = $this->parseFile($info); @@ -82,6 +83,8 @@ class Upload { */ if($callback) { return ''; + }elseif($CKEditorFuncNum) { + return ''; } else { return json_encode($data); }