From e0284d61c300ae54f5792aa819826eeaefab0db9 Mon Sep 17 00:00:00 2001
From: "jackfinal-PC\\jackfinal" <final_m@foxmail.com>
Date: Sat, 10 Dec 2016 14:59:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91=E5=99=A8?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common/controller/Upload.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 '<script>'.$callback.'('.json_encode($data).')</script>';
+		}elseif($CKEditorFuncNum) {
+			return '<script>window.parent.CKEDITOR.tools.callFunction("'.$CKEditorFuncNum.'","'.$fileInfo['url'].'","'.$data['state'].'");</script>';
 		} else {
 			return json_encode($data);
 		}