diff --git a/src/system/archive/taglist.class.php b/src/system/archive/taglist.class.php
index 8f4d44cc..db74aea7 100755
--- a/src/system/archive/taglist.class.php
+++ b/src/system/archive/taglist.class.php
@@ -105,15 +105,9 @@ class TagList
}
if (isset($GLOBALS['PageNo'])) {
$this->PageNo = intval($GLOBALS['PageNo']);
- if ($this->PageNo == 0) {
- $this->PageNo = 1;
- }
} else {
$this->PageNo = 1;
}
- if (stripos(GetCurUrl(), 'makehtml_taglist_action.php')) {
- $this->TotalResult = 1;
- }
if ($this->TotalResult == -1) {
$cquery = "SELECT COUNT(*) AS dd FROM `#@__taglist` WHERE tid = '{$this->TagInfos['id']}' AND arcrank >-1 ";
$row = $this->dsql->GetOne($cquery);
@@ -478,6 +472,14 @@ class TagList
}
return $plist;
}
+ /**
+ * 获取静态的分页列表
+ *
+ * @access public
+ * @param int $list_len 列表宽度
+ * @param string $listitem 列表样式
+ * @return string
+ */
function GetPageListST($list_len, $listitem = "info,index,end,pre,next,pageno")
{
$prepage = '';
@@ -498,14 +500,14 @@ class TagList
$purl = $this->tagsDir.'/'.$this->TagInfos['id'];
//获得上页和下页的链接
if ($this->PageNo != 1) {
- $prepage .= "
上页";
- $indexpage = "首页";
+ $prepage .= "上页";
+ $indexpage = "首页";
} else {
$indexpage = "首页";
}
if ($this->PageNo != $totalpage && $totalpage > 1) {
- $nextpage .= "下页";
- $endpage = "末页";
+ $nextpage .= "下页";
+ $endpage = "末页";
} else {
$endpage = "末页";
}
@@ -528,7 +530,7 @@ class TagList
if ($j == $this->PageNo) {
$listdd .= "$j";
} else {
- $listdd .= "$j";
+ $listdd .= "$j";
}
}
$plist = '';
@@ -570,7 +572,7 @@ class TagList
$envs['makeTag'] = 1;
$tagsdir = str_replace("{cmspath}", $cfg_cmspath, $cfg_tags_dir);
if (isset($envs['makeTag']) && $envs['makeTag'] == 1) {
- $this->Fields['position'] = $cfg_cmsurl.$tagsdir."/";
+ $this->Fields['position'] = $cfg_cmsurl.$tagsdir;
}
if (empty($this->TotalResult) && $this->Tag != "") $this->CountRecord();
//初步给固定值的标记赋值
@@ -595,7 +597,7 @@ class TagList
if ($endpage == 1) {
$endpage = 2;
}
- $makeDir = $this->GetTruePath().$this->tagsDir.'/'.$this->TagInfos['id']."/";
+ $makeDir = $this->GetTruePath().$this->tagsDir.'/'.$this->TagInfos['id'];
MkdirAll($makeDir, $cfg_dir_purview);
for ($this->PageNo = $startpage; $this->PageNo < $endpage; $this->PageNo++) {
$this->ParseDMFields($this->PageNo, 1);
diff --git a/src/system/taglib/tag.lib.php b/src/system/taglib/tag.lib.php
index 2f93fbb7..6f144986 100755
--- a/src/system/taglib/tag.lib.php
+++ b/src/system/taglib/tag.lib.php
@@ -53,9 +53,9 @@ function lib_tag(&$ctag, &$refObj)
$row['keyword'] = $row['tag'];
$row['tag'] = dede_htmlspecialchars($row['tag']);
if (isset($envs['makeTag']) && $envs['makeTag'] == 1 || $ishtml == 1) {
- $row['link'] = $cfg_cmsurl.$tagsdir."/".$row['id']."/";
+ $row['link'] = $cfg_cmsurl.$tagsdir."/".$row['id'];
} else {
- $row['link'] = $cfg_cmsurl."/apps/tags.php?/".$row['id']."";
+ $row['link'] = $cfg_cmsurl."/apps/tags.php?/".$row['id'];
}
$row['highlight'] = mt_rand(1, 10);
foreach ($ctp->CTags as $tagid => $ctag) {