diff --git a/src/admin/dialog/select_images_post.php b/src/admin/dialog/select_images_post.php
index 2a01d97b..6bfc9894 100644
--- a/src/admin/dialog/select_images_post.php
+++ b/src/admin/dialog/select_images_post.php
@@ -33,7 +33,7 @@ if (!preg_match("#\.(".$cfg_imgtype.")#i", $imgfile_name)) {
     exit();
 }
 $nowtme = time();
-$sparr = array("image/pjpeg", "image/jpeg", "image/gif", "image/png", "image/xpng", "image/wbmp");
+$sparr = array("image/pjpeg", "image/jpeg", "image/gif", "image/png", "image/xpng", "image/wbmp", "image/webp");
 $imgfile_type = strtolower(trim($imgfile_type));
 if (!in_array($imgfile_type, $sparr)) {
     ShowMsg("上传的图片格式错误，请使用JPEG、GIF、PNG、WBMP格式的其中一种", "-1");
diff --git a/src/install/sql-dfdata.txt b/src/install/sql-dfdata.txt
index eec5b48d..4f7c4d57 100755
--- a/src/install/sql-dfdata.txt
+++ b/src/install/sql-dfdata.txt
@@ -3956,7 +3956,7 @@ INSERT INTO `#@__sysconfig` VALUES
 ('12','cfg_ddimg_width','缩略图默认宽度','3','number','400'),
 ('13','cfg_ddimg_height','缩略图默认高度','3','number','300'),
 ('14','cfg_album_width','图集默认显示图片的大小','3','number','800'),
-('15','cfg_imgtype','图片浏览器文件类型','3','string','jpg|gif|png'),
+('15','cfg_imgtype','图片浏览器文件类型','3','string','jpg|gif|png|webp|bmp'),
 ('16','cfg_softtype','允许上传的软件类型','3','bstring','zip|gz|rar|iso|doc|xsl|ppt|wps'),
 ('17','cfg_mediatype','允许的多媒体文件类型','3','bstring','swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov'),
 ('18','cfg_specnote','专题的最大节点数','2','number','10'),
diff --git a/src/static/ckeditor/config.js b/src/static/ckeditor/config.js
index ffa872b9..17f1dddc 100644
--- a/src/static/ckeditor/config.js
+++ b/src/static/ckeditor/config.js
@@ -21,6 +21,6 @@ CKEDITOR.editorConfig = function (config) {
 	config.height = 450;
 	config.removePlugins = 'exportpdf';
 	config.extraPlugins = 'html5video,dedepagebreak,textindent';
-	config.removeButtons = 'About,ShowBlocks,Iframe,Flash,Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField';
+	config.removeButtons = 'Save,NewPage,Print,Preview,Templates,Smiley,About,ShowBlocks,Iframe,Flash,Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField';
 	config.font_names='宋体/SimSun;楷体/KaiTi;黑体/SimHei;微软雅黑/Microsoft YaHei;微软正黑/Microsoft JhengHei'+ config.font_names;
 };
\ No newline at end of file