diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 755f1427a..f96216658 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -3787,17 +3787,18 @@ _extend(KEdit, KWidget, {
 				} else {
 					val = body.innerHTML;
 				}
-//				if (self.beforeGetHtml) {
-//					val = self.beforeGetHtml(val);
-//				}
+                //yk
+				if (self.beforeGetHtml) {
+					val = self.beforeGetHtml(val);
+				}
 				if (_GECKO && val == '<br />') {
 					val = '';
 				}
 				return val;
 			}
-//			if (self.beforeSetHtml) {
-//				val = self.beforeSetHtml(val);
-//			}
+			if (self.beforeSetHtml) {
+				val = self.beforeSetHtml(val);
+			}
 			if (_IE && _V >= 9) {
 				val = val.replace(/(<.*?checked=")checked(".*>)/ig, '$1$2');
 			}
diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js
index 41474d013..385e02ac2 100644
--- a/public/assets/kindeditor/pasteimg.js
+++ b/public/assets/kindeditor/pasteimg.js
@@ -362,12 +362,14 @@ function df(myself) {
     var sstr = "";
     $(img).each(function (i) {
         var that = $(this);
-        if (that.attr("src").indexOf("http://") >= 0 || that.attr("src").indexOf("https://") >= 0) {
-            piccount++;
-            if (i == $(img).length - 1)
-                sstr += that.attr("src");
-            else
-                sstr += that.attr("src") + "|";
+        if(that.attr("src")) {
+            if (that.attr("src").indexOf("http://") >= 0 || that.attr("src").indexOf("https://") >= 0) {
+                piccount++;
+                if (i == $(img).length - 1)
+                    sstr += that.attr("src");
+                else
+                    sstr += that.attr("src") + "|";
+            }
         }
     });
     uploadpic(sstr,myself);
@@ -409,12 +411,18 @@ function uploadpic(piclist,myself) {
                 var tIndex = 0;
                 $(img).each(function (i) {
                     var that = $(this);
-                    if (that.attr("src").indexOf("http://") >= 0 || that.attr("src").indexOf("https://") >= 0) {
-                        that.attr("src",  str[tIndex]);
-                        that.attr("data-ke-src", str[tIndex]);
-                        that.parent().attr("href",  str[tIndex]);
-                        that.parent().attr("data-ke-src",  str[tIndex]);
-                        tIndex = tIndex + 1;
+                    if(that.attr("src")){
+                        if (that.attr("src").indexOf("http://") >= 0 || that.attr("src").indexOf("https://") >= 0) {
+                            that.attr("src",  str[tIndex]);
+                            that.attr("data-ke-src", str[tIndex]);
+
+                            //非视频
+                            if(!(that.parent().attr("class") && that.parent().attr("class") == "mediaIcobox" )) {
+                                that.parent().attr("href", str[tIndex]);
+                                that.parent().attr("data-ke-src", str[tIndex]);
+                            }
+                            tIndex = tIndex + 1;
+                        }
                     }
                 });
             }