From 651a3402690fac441d1e9fbc732a33cbffa5b27f Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Mon, 17 Jun 2019 20:59:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=99=84=E4=BB=B6=E5=88=86?=
 =?UTF-8?q?=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Payment.php | 3 +++
 application/admin/controller/Ueditor.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/application/admin/controller/Payment.php b/application/admin/controller/Payment.php
index 1d48c7751..3d0b23db7 100755
--- a/application/admin/controller/Payment.php
+++ b/application/admin/controller/Payment.php
@@ -95,6 +95,9 @@ class Payment extends Common
         // 参数
         $this->assign('params', $params);
 
+        // 编辑器文件存放地址
+        $this->assign('editor_path_type', 'payment');
+
         return $this->fetch();
     }
 
diff --git a/application/admin/controller/Ueditor.php b/application/admin/controller/Ueditor.php
index dffbd7b9f..69f015185 100755
--- a/application/admin/controller/Ueditor.php
+++ b/application/admin/controller/Ueditor.php
@@ -367,7 +367,7 @@ class Ueditor extends Common
 		// 倒序
 		//$files = $this->ArrayQuickSort($files);
 
-		if(count($files) > 0)
+		if(is_array($files) && count($files) > 0)
 		{
 			/* 获取指定范围的列表 */
 			$len = count($files);
-- 
GitLab