diff --git a/src/system/archive/archives.class.php b/src/system/archive/archives.class.php index 4cae9136..c86c4ff3 100755 --- a/src/system/archive/archives.class.php +++ b/src/system/archive/archives.class.php @@ -67,8 +67,8 @@ class Archives //如果当前文档不是系统模型,为单表模型 $query = "SELECT arc.*,tp.reid,tp.typedir,ch.addtable FROM `#@__archives` arc - LEFT JOIN #@__arctype tp on tp.id=arc.typeid - LEFT JOIN #@__channeltype as ch on arc.channel = ch.id + LEFT JOIN `#@__arctype` tp on tp.id=arc.typeid + LEFT JOIN `#@__channeltype` as ch on arc.channel = ch.id WHERE arc.id='$aid' "; $this->Fields = $this->dsql->GetOne($query); } else { diff --git a/src/system/taglib/channel/stepselect.lib.php b/src/system/taglib/channel/stepselect.lib.php index 418f3dea..a12dff70 100755 --- a/src/system/taglib/channel/stepselect.lib.php +++ b/src/system/taglib/channel/stepselect.lib.php @@ -16,15 +16,10 @@ function ch_stepselect($fvalue, &$arcTag, &$refObj, $fname = '') function GetEnumsValue2($egroup, $evalue = 0) { if (!isset($GLOBALS['em_'.$egroup.'s'])) { - $cachefile = DEDEDATA.'/enums/'.$egroup.'.php'; - if (!file_exists($cachefile)) { - require_once(DEDEINC.'/enums.func.php'); - WriteEnumsCache(); - } - if (!file_exists($cachefile)) { - return ''; - } else { - require_once($cachefile); + $cachefile = DEDESTATIC.'/enums/'.$egroup.'.json'; + $data = json_decode(file_get_contents($cachefile)); + foreach ($data as $key => $value) { + $GLOBALS['em_'.$egroup.'s'][$key] = $value; } } if ($evalue >= 500) {