修正栏目位置链接错误，修正数据库还原的错误

src/dede/makehtml_all.php

@@ -55,7 +55,7 @@ if ($action == '') {
             $pv->SaveToHtml($homeFile);
             $pv->Close();
         } else {
-            if (file_exists($homeFile)) @unlink($homeFile);
+            if (file_exists($homeFile)) echo "启用静态生成，建议删除"+$homeFile;
         }
         ShowMsg("完成更新所有文档，现在开始更新栏目页！", "makehtml_all.php?action=make&step=4&uptype=$uptype&mkvalue=$mkvalue");
         exit();

src/dede/sys_data_done.php

@@ -11,6 +11,7 @@
  */
 @ob_start();
 @set_time_limit(0);
+ini_set('memory_limit', '-1');
 require_once(dirname(__FILE__) . '/config.php');
 CheckPurview('sys_Data');
 if (empty($dopost)) $dopost = '';
@@ -198,7 +199,8 @@ if ($dopost == 'bak') {
 /*-------------------------
 还原数据
 function __re_data();
--------------------------*/ else if ($dopost == 'redat') {
+-------------------------*/ 
+else if ($dopost == 'redat') {
     if ($bakfiles == '') {
         ShowMsg('没指定任何要还原的文件!', 'javascript:;');
         exit();
@@ -222,9 +224,9 @@ function __re_data();
         }
         fclose($fp);
         $querys = explode(';', $tbdata);
-
         foreach ($querys as $q) {
-            $dsql->ExecuteNoneQuery(trim($q) . ';');
+            $q = preg_replace("#TYPE=MyISAM#i","ENGINE=MyISAM DEFAULT CHARSET=".$cfg_db_language, $q);
+            $rs = $dsql->ExecuteNoneQuery(trim($q) . ';');
         }
         if ($delfile == 1) {
             @unlink("$bkdir/$structfile");

src/include/typelink.class.php

@@ -150,7 +150,7 @@ class TypeLink
     //获得某类目的链接列表，递归逻辑部分
     function LogicGetPosition($id, $islink)
     {
-        $this->dsql->SetQuery("SELECT id,reid,typename,typedir,isdefault,ispart,defaultname,namerule2,moresite,siteurl,sitepath FROM #@__arctype WHERE id='" . $id . "'");
+        $this->dsql->SetQuery("SELECT id,reid,typename,typedir,isdefault,ispart,defaultname,namerule2,moresite,siteurl,sitepath FROM `#@__arctype` WHERE id='" . $id . "'");
         $tinfos = $this->dsql->GetOne();
         if ($islink) {
             $this->valuePosition = $this->GetOneTypeLink($tinfos) . $this->SplitSymbol . $this->valuePosition;
@@ -168,7 +168,7 @@ class TypeLink
     function GetOneTypeLink($typeinfos)
     {
         $typepage = $this->GetOneTypeUrl($typeinfos);
-        $typelink = "<li class='breadcrumb-item'><a href='" . $typepage . "'>" . $typeinfos['typename'] . "</a></a>";
+        $typelink = "<li class='breadcrumb-item'><a href='" . $typepage . "'>" . $typeinfos['typename'] . "</a></li>";
         return $typelink;
     }
 
@@ -210,7 +210,7 @@ class TypeLink
         $this->OptionArrayList = '';
 
         if ($hid > 0) {
-            $row = $this->dsql->GetOne("SELECT id,typename,ispart,channeltype FROM #@__arctype WHERE id='$hid'");
+            $row = $this->dsql->GetOne("SELECT id,typename,ispart,channeltype FROM `#@__arctype` WHERE id='$hid'");
             $channeltype = $row['channeltype'];
             if ($row['ispart'] == 1) {
                 $this->OptionArrayList .= "<option value='" . $row['id'] . "' style='background-color:#DFDFDB;color:#888888' selected>" . $row['typename'] . "</option>\r\n";
@@ -275,7 +275,7 @@ class TypeLink
         global $cfg_admin_channel;
         if (empty($cfg_admin_channel)) $cfg_admin_channel = 'all';
 
-        $this->dsql->SetQuery("SELECT id,typename,ispart FROM #@__arctype WHERE reid='" . $id . "' AND ispart<>2 ORDER BY sortrank ASC");
+        $this->dsql->SetQuery("SELECT id,typename,ispart FROM `#@__arctype` WHERE reid='" . $id . "' AND ispart<>2 ORDER BY sortrank ASC");
         $this->dsql->Execute($id);
         while ($row = $this->dsql->GetObject($id)) {
             if (is_array($oper) && $cfg_admin_channel != 'all') {
@@ -332,7 +332,7 @@ class TypeLink
         if ($innertext == "") $innertext = GetSysTemplets("channel_list.htm");
 
         if ($reid == 0 && $typeid > 0) {
-            $dbrow = $this->dsql->GetOne("SELECT reid FROM #@__arctype WHERE id='$typeid' ");
+            $dbrow = $this->dsql->GetOne("SELECT reid FROM `#@__arctype` WHERE id='$typeid' ");
             if (is_array($dbrow)) {
                 $reid = $dbrow['reid'];
             }
@@ -340,13 +340,13 @@ class TypeLink
         $likeType = "";
         if ($typetype == "top") {
             $sql = "SELECT id,typename,typedir,isdefault,ispart,defaultname,namerule2,moresite,siteurl
-          FROM #@__arctype WHERE reid=0 AND ishidden<>1 ORDER BY sortrank ASC limit 0,$row";
+          FROM `#@__arctype` WHERE reid=0 AND ishidden<>1 ORDER BY sortrank ASC limit 0,$row";
         } else if ($typetype == "sun" || $typetype == "son") {
             $sql = "SELECT id,typename,typedir,isdefault,ispart,defaultname,namerule2,moresite,siteurl
-          FROM #@__arctype WHERE reid='$typeid' AND ishidden<>1 ORDER BY sortrank ASC limit 0,$row";
+          FROM `#@__arctype` WHERE reid='$typeid' AND ishidden<>1 ORDER BY sortrank ASC limit 0,$row";
         } else if ($typetype == "self") {
             $sql = "SELECT id,typename,typedir,isdefault,ispart,defaultname,namerule2,moresite,siteurl
-            FROM #@__arctype WHERE reid='$reid' AND ishidden<>1 ORDER BY sortrank ASC limit 0,$row";
+            FROM `#@__arctype` WHERE reid='$reid' AND ishidden<>1 ORDER BY sortrank ASC limit 0,$row";
         }
 
         //AND ID<>'$typeid'