Merge branch 'develop' of https://www.zhelixie.com/DedeBIZ/DedeV6 into develop

src/admin/api.php

@@ -115,6 +115,13 @@ if ($action === 'is_need_check_code') {
     $row2 = $dsql->GetOne($query);
     if ($row2) $add_query .= "&acount={$row2['dd']}";
     $offUrl = DEDEBIZURL."/version?version={$cfg_version_detail}&formurl={$nurl}&phpver={$phpv}&os={$sp_os}&mysqlver={$mysql_ver}{$add_query}&json=1";
+    if (strpos($_SERVER['SERVER_SOFTWARE'], 'Development Server') !== false && version_compare(phpversion(), '7.2', '<')) {
+        echo json_encode(array(
+            "code"=>-1,
+            "msg"=>'获取版本信息失败',
+        ));
+        exit;
+    }
     $dhd = new DedeHttpDown();
     $dhd->OpenUrl($offUrl);
     $data = $dhd->GetHtml();

src/admin/index_body.php

@@ -8,11 +8,11 @@
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
-require(dirname(__FILE__).'/config.php');
-require(DEDEINC.'/image.func.php');
-require(DEDEINC.'/dedetag.class.php');
+require_once(dirname(__FILE__).'/config.php');
+require_once(DEDEINC.'/image.func.php');
+require_once(DEDEINC.'/dedetag.class.php');
 if (empty($dopost)) {
-    require(DEDEINC.'/inc/inc_fun_funAdmin.php');
+    require_once(DEDEINC.'/inc/inc_fun_funAdmin.php');
     $verLockFile = DEDEDATA.'/admin/ver.txt';
     $fp = fopen($verLockFile, 'r');
     $upTime = trim(fread($fp, 64));

src/install/index.php

@@ -11,7 +11,7 @@ error_reporting(E_ALL || ~E_NOTICE);
 define('INSLOCKFILE', dirname(__FILE__).'/install_lock.txt');
 $verMsg = 'V6';
 $dfDbname = 'DedeBIZ';
-$cfg_version_detail = '6.2.7'; //详细版本号
+$cfg_version_detail = '6.2.8beta'; //详细版本号
 $errmsg = '';
 if (version_compare(PHP_VERSION, '8.0.0', '>=') && function_exists("mysqli_report")) {
     mysqli_report(MYSQLI_REPORT_OFF);

src/system/common.func.php

@@ -527,6 +527,7 @@ function GetUpdateSQL()
 }
 /*会员中心调用默认主题模板<?php pasterTempletDiy('head.htm');?>*/
 if (!function_exists('pasterTempletDiy')) {
+    require_once DEDEINC."/archive/partview.class.php";
     function pasterTempletDiy($path)
     {
         global $cfg_basedir, $cfg_templets_dir, $cfg_df_style;

src/system/common.inc.php

@@ -189,7 +189,7 @@ $cfg_soft_dir = $cfg_medias_dir.'/soft';
 $cfg_other_medias = $cfg_medias_dir.'/media';
 //软件摘要信息，请不要删除，否则系统无法正确接收系统漏洞或升级信息
 $cfg_version = 'V6';
-$cfg_version_detail = '6.2.7';//详细版本号
+$cfg_version_detail = '6.2.8beta';//详细版本号
 $cfg_soft_lang = 'utf-8';
 $cfg_soft_public = 'base';
 $cfg_softname = '得德系统';