diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index d9b51648c..b019bccf1 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -4188,7 +4188,7 @@ _extend(KUploadButton, {
 		button.hide();
 		button.before(div);
 		self.div = div;
-		options.ops.up_file_div = div;//options.ops是KindEditor.create()的options参数
+		if(options.ops!=undefined)options.ops.up_file_div = div;//options.ops是KindEditor.create()的options参数
 		self.button = button;
 		self.iframe = options.target ? K('iframe[name="' + target + '"]') : K('iframe', div);
 		self.form = options.form ? K(options.form) : K('form', div);
@@ -4990,13 +4990,13 @@ KEditor.prototype = {
             'emoticons',
             'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|',
             'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
-            'italic', 'underline', 'removeformat', '|','imagedirectupload','table',   'link', "less",
+            'italic', 'underline', 'removeformat', '|','imagedirectupload','table',   'media', "less",
                 '/',
              'undo', 'redo', '|', 'preview', 'print', 'template',
             'justifyfull', 'insertunorderedlist', 'indent', 'outdent', 'subscript',
-            'superscript', 'clearhtml', 'quickformat', 'selectall',  'fontname',
+            'superscript', 'clearhtml', 'quickformat', /* 'selectall',*/  'fontname',
             'strikethrough', 'lineheight', 'hr', 'pagebreak',
-            'anchor' , 'unlink'
+            'anchor' , 'link','unlink'
         ]
         K.each(fullItems, function(i, name) {
             if (name == '|') {