From 552afed739743961f02054dacd01a0ea2a5f1e8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?=
 <93301500+xushubieli@users.noreply.github.com>
Date: Sun, 30 Mar 2025 14:01:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=89=E8=A3=85=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BC=98=E5=8C=96=E6=89=A9?=
 =?UTF-8?q?=E5=B1=95=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/system/common.inc.php  |  7 ++++---
 src/system/extend.func.php | 38 +++++++++++++++++---------------------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/system/common.inc.php b/src/system/common.inc.php
index dd236337..f6dc54fa 100755
--- a/src/system/common.inc.php
+++ b/src/system/common.inc.php
@@ -158,9 +158,10 @@ if (PHP_SAPI === 'cli') {
 } else {
     $cfg_clihost = 'http://'.$_SERVER['HTTP_HOST'];
 }
-
-if (!isset($cfg_cmspath)) {
-    $cfg_cmspath = "";
+if (isset($cfg_cmspath)) {
+    $cfg_cmspath = $cfg_cmspath;
+} else {
+    $cfg_cmspath = '';
 }
 //站点根目录
 $cfg_basedir = preg_replace('#'.$cfg_cmspath.'\/system$#i', '', DEDEINC);
diff --git a/src/system/extend.func.php b/src/system/extend.func.php
index 8de2b4f1..e9ae3735 100755
--- a/src/system/extend.func.php
+++ b/src/system/extend.func.php
@@ -39,28 +39,25 @@ function obtaintags($aid, $num = 3)
     return $tags;
 }
 //提取文档多图片[field:body function='obtainimgs(@me,3)'/]3表示调用文档3张图片，例如：文档模型body字段，列表附加字段添加body，dede:arclist标签调用添加channelid='1' addfields='body'
-if (!function_exists('obtainimgs')) {
-    function obtainimgs($string, $num)
+function obtainimgs($string, $num)
+{
+    preg_match_all("/<img([^>]*)\s*src=('|\")([^'\"]+)('|\")/", $string, $matches);
+    $imgsrc_arr = array_unique($matches[3]);
+    $i = 0;
+    $result = '';
+    foreach ($imgsrc_arr as $imgsrc)
     {
-        preg_match_all("/<img([^>]*)\s*src=('|\")([^'\"]+)('|\")/", $string, $matches);
-        $imgsrc_arr = array_unique($matches[3]);
-        $i = 0;
-        $result = '';
-        foreach ($imgsrc_arr as $imgsrc)
-        {
-            if ($i == $num) break;
-            $result .= "<img src=\"{$imgsrc}\">";
-            $i++;
-        }
-        return $result;
+        if ($i == $num) break;
+        $result .= "<img src=\"{$imgsrc}\">";
+        $i++;
     }
+    return $result;
 }
 //文档图片注释自动为标题{dede:field.body function='obtainalt(@me)'/}
 function obtainalt($newalt)
 {
-    global $dsql, $id, $aid;
-    $myid = isset($id) ? $id : $aid;
-    $row = $dsql->GetOne("SELECT title FROM `#@__archives` WHERE id='$myid'");
+    global $dsql, $id;
+    $row = $dsql->GetOne("SELECT title FROM `#@__archives` WHERE id='$id'");
     //检查$row是否为有效的数组并且包含title
     if (is_array($row) && isset($row['title'])) {
         //图片注释自动为标题
@@ -77,12 +74,11 @@ function obtainalt($newalt)
 //联动单筛选{dede:php}obtainfilter(模型id,类型,'字段1,字段2');{/dede:php}类型表示前台展现方式，对应case值，例如：文档模型style字段radio选项卡类型，列表附加字段类别添加style，标签调用{dede:php}obtainfilter(1,1,'style');{/dede:php}
 function obtainfilter($channelid, $type = 1, $fieldsnamef = '', $defaulttid = 0, $toptid = 0, $loadtype = 'autofield')
 {
-    global $tid, $dsql, $id, $aid;
+    global $tid, $dsql, $id;
     $tid = $defaulttid ? $defaulttid : $tid;
-    if ($id!="" || $aid!="") {
-        $arcid = $id!="" ? $id : $aid;
-        $tidsq = $dsql->GetOne("SELECT * FROM `#@__archives` WHERE id='$arcid'");
-        $tid = $toptid==0 ? $tidsq["typeid"] : $tidsq["topid"];
+    if ($id != "") {
+        $tidsq = $dsql->GetOne("SELECT * FROM `#@__archives` WHERE id='$id'");
+        $tid = $toptid == 0 ? $tidsq["typeid"] : $tidsq["topid"];
     }
     $nofilter = (isset($_REQUEST['TotalResult']) ? "&TotalResult=".$_REQUEST['TotalResult'] : '').(isset($_REQUEST['PageNo']) ? "&PageNo=".$_REQUEST['PageNo'] : '');
     $filterarr = stripos($_SERVER['REQUEST_URI'], "list.php?tid=") ? str_replace($nofilter, '', $_SERVER['REQUEST_URI']) : $GLOBALS['cfg_cmsurl']."apps/list.php?tid=".$tid;