From 7174764df1fc0c56cf9805304fb0148805e4ff62 Mon Sep 17 00:00:00 2001
From: tianya <tianya@benshar.com>
Date: Sat, 24 Apr 2021 11:00:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=99=A8=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/include/inc/inc_fun_funAdmin.php | 2 +-
 src/install/sql-dftables.txt         | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/include/inc/inc_fun_funAdmin.php b/src/include/inc/inc_fun_funAdmin.php
index 3d02a22b..f4c4f925 100755
--- a/src/include/inc/inc_fun_funAdmin.php
+++ b/src/include/inc/inc_fun_funAdmin.php
@@ -173,7 +173,7 @@ function SpGetEditor($fname, $fvalue, $nheight = "350", $etype = "Basic", $gtype
     } else if ($GLOBALS['cfg_html_editor'] == 'ckeditor') {
         $addConfig = "";
         if (defined("DEDEADMIN")) {
-            $addConfig = ",{filebrowserImageUploadUrl:'./dialog/select_images_post.php',filebrowserUploadUrl:'./dialog/select_media_post.php?ck=1',extraPlugins:'html5video,dedepagebreak,ddfilebrowser'}";
+            $addConfig = ",{allowedContent:true,filebrowserImageUploadUrl:'./dialog/select_images_post.php',filebrowserUploadUrl:'./dialog/select_media_post.php?ck=1',extraPlugins:'html5video,dedepagebreak,ddfilebrowser'}";
             // $addConfig = ",{filebrowserImageUploadUrl:'./dialog/select_images_post.php'}";
         }
         $code = <<<EOT
diff --git a/src/install/sql-dftables.txt b/src/install/sql-dftables.txt
index 0b665480..c88077b8 100755
--- a/src/install/sql-dftables.txt
+++ b/src/install/sql-dftables.txt
@@ -198,7 +198,6 @@ CREATE TABLE `#@__archives` (
   `description` varchar(255) NOT NULL default '',
   `filename` varchar(40) NOT NULL default '',
   `dutyadmin` mediumint(8) unsigned NOT NULL default '0',
-  `tackid` int(10) NOT NULL default '0',
   `mtype` mediumint(8) unsigned NOT NULL default '0',
   `weight` int(10) NOT NULL default '0',
   PRIMARY KEY  (`id`),