diff --git a/docs/changelog.md b/docs/changelog.md index 57ab3caa..2e6a71f7 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,6 +1,12 @@ # 更新记录 通过访问 https://www.dedebiz.com/git 获取完整更新记录 +## v6.0.4 +- 兼容PHP8.0; +- 修正已知存在的安全问题; +- 优化系统管理后台界面; +- 修正sqlite3下的错误; + ## v6.0.0 - 调整DedeCMS目录结构,将原有include中外部访问的内容迁移出去; - 修正已知存在的安全问题; diff --git a/src/dede/article_keywords_select.php b/src/dede/article_keywords_select.php index fb7dd78b..a1efb9b8 100755 --- a/src/dede/article_keywords_select.php +++ b/src/dede/article_keywords_select.php @@ -17,7 +17,7 @@ $f = RemoveXSS($f); if (empty($keywords)) $keywords = ""; -$sql = "SELECT * FROM #@__keywords ORDER BY rank DESC"; +$sql = "SELECT * FROM `#@__keywords` ORDER BY `rank` DESC"; $dlist = new DataListCP(); $dlist->SetTemplate(DEDEADMIN."/templets/article_keywords_select.htm"); $dlist->pageSize = 300; diff --git a/src/dede/member_rank.php b/src/dede/member_rank.php index 4eea9f43..e036a162 100755 --- a/src/dede/member_rank.php +++ b/src/dede/member_rank.php @@ -29,7 +29,7 @@ if ($dopost == 'save') { $query = "UPDATE `#@__arcrank` SET membername='$name',money='$money',`rank`='$rank',scores='$scores' WHERE id='$id' "; } } else { - $query = "DELETE FROM `#@__arcrank` WHERE id='$id' AND rank<>10"; + $query = "DELETE FROM `#@__arcrank` WHERE id='$id' AND `rank`<>10"; } if ($query != '') $dsql->ExecuteNoneQuery($query); } @@ -42,7 +42,7 @@ if ($dopost == 'save') { echo ""; } if ($dopost == 'del') { - $dsql->ExecuteNoneQuery("DELETE FROM `#@__arcrank` WHERE id='$id' AND rank<>10"); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__arcrank` WHERE id='$id' AND `rank`<>10"); ShowMsg("删除成功", "member_rank.php"); exit(); } diff --git a/src/include/dedesqlite.class.php b/src/include/dedesqlite.class.php index 2f8c448a..b6d416cf 100755 --- a/src/include/dedesqlite.class.php +++ b/src/include/dedesqlite.class.php @@ -29,6 +29,9 @@ $dsql = $dsqlitete = $db = new DedeSqlite(FALSE); if (!defined('MYSQL_BOTH')) { define('MYSQL_BOTH', MYSQLI_BOTH); } +if (!defined('MYSQL_ASSOC')) { + define('MYSQL_ASSOC', SQLITE3_ASSOC); +} class DedeSqlite { var $linkID; @@ -122,13 +125,13 @@ class DedeSqlite //为了防止采集等需要较长运行时间的程序超时,在运行这类程序时设置系统等待和交互时间 function SetLongLink() { - @mysqli_query("SET interactive_timeout=3600, wait_timeout=3600 ;", $this->linkID); + // @mysqli_query("SET interactive_timeout=3600, wait_timeout=3600 ;", $this->linkID); } //获得错误描述 function GetError() { - $str = mysqli_error($this->linkID); + $str = $dsqlite->lastErrorMsg(); return $str; } @@ -291,7 +294,7 @@ class DedeSqlite } //执行一个SQL语句,返回前一条记录或仅返回一条记录 - function GetOne($sql = '', $acctype = MYSQLI_ASSOC) + function GetOne($sql = '', $acctype = SQLITE3_ASSOC) { global $dsqlite; if (!$dsqlite->isInit) {