From fbdc102e59cbf54760e5f23a2a2d83786968d4fb Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Fri, 27 Jul 2018 11:57:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9kindeditor=E6=96=87=E4=BB=B6v?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/bootstrap3/header.php | 3 ++-
 js/kindeditor/kindeditor.js             | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php
index 1bf173bc..2037038e 100644
--- a/application/views/bootstrap3/header.php
+++ b/application/views/bootstrap3/header.php
@@ -5,7 +5,8 @@
         <meta charset="utf-8">
         <title>信息平台</title>
         <link rel="stylesheet" href="/css/information-system3.css?v=201508112" type="text/css" />
-        <script type="text/javascript" src="/min/?f=/js/information-system3.min.js,/js/common.js&v=2018022601"></script>
+        <script type="text/javascript" src="http://cht.mycht.cn/min/?f=/js/information-system3.min.js,/js/common.js&v=2018022601"></script>
+        <!-- <script type="text/javascript" src="http://cht.mycht.cn/js/kindeditor/kindeditor.js?v=20160601"></script> -->
         <script type="text/javascript" src="/js/kindeditor/kindeditor.js?v=20180725"></script>
         <link rel="shortcut icon" href="/bootstrap/img/glyphicons_290_skull.png">
 
diff --git a/js/kindeditor/kindeditor.js b/js/kindeditor/kindeditor.js
index 5a521f49..395f7ea4 100644
--- a/js/kindeditor/kindeditor.js
+++ b/js/kindeditor/kindeditor.js
@@ -17,7 +17,7 @@ if (!window.console) {
 if (!console.log) {
 	console.log = function () {};
 }
-var _VERSION = '4.1.6 (2013-03-24) 20160601',
+var _VERSION = '4.1.6 (2013-03-24) 20180725',
 	_ua = navigator.userAgent.toLowerCase(),
 	_IE = _ua.indexOf('msie') > -1 && _ua.indexOf('opera') == -1,
 	_GECKO = _ua.indexOf('gecko') > -1 && _ua.indexOf('khtml') == -1,