@@ -126,4 +126,5 @@ $(document).ready(function() { | |||||
$("#btnOK").click(function() { | $("#btnOK").click(function() { | ||||
hasNewVersion(); | hasNewVersion(); | ||||
}); | }); | ||||
hasNewVersion(); | |||||
}); | }); |
@@ -109,10 +109,14 @@ if (!isset($needFilter)) { | |||||
$registerGlobals = @ini_get("register_globals"); | $registerGlobals = @ini_get("register_globals"); | ||||
$isUrlOpen = @ini_get("allow_url_fopen"); | $isUrlOpen = @ini_get("allow_url_fopen"); | ||||
//系统配置参数 | //系统配置参数 | ||||
if (!file_exists(DEDEDATA."/config.cache.inc.php")) { | |||||
if (!file_exists(DEDEDATA."/config.cache.inc.php") && !defined('DEDE_CLITOOLS')) { | |||||
die('DedeBIZ初始化失败,确保系统正确被安装'); | die('DedeBIZ初始化失败,确保系统正确被安装'); | ||||
} | } | ||||
require_once(DEDEDATA."/config.cache.inc.php"); | |||||
if (file_exists(DEDEDATA."/config.cache.inc.php")) { | |||||
require_once(DEDEDATA."/config.cache.inc.php"); | |||||
} | |||||
//Session保存路径 | //Session保存路径 | ||||
$sessSaveHandler = @ini_get("session.save_handler"); | $sessSaveHandler = @ini_get("session.save_handler"); | ||||
if ($sessSaveHandler !== "files") { | if ($sessSaveHandler !== "files") { | ||||
@@ -154,6 +158,7 @@ if (PHP_SAPI === 'cli') { | |||||
} else { | } else { | ||||
$cfg_clihost = 'http://'.$_SERVER['HTTP_HOST']; | $cfg_clihost = 'http://'.$_SERVER['HTTP_HOST']; | ||||
} | } | ||||
if (!isset($cfg_cmspath)) { | if (!isset($cfg_cmspath)) { | ||||
$cfg_cmspath = ""; | $cfg_cmspath = ""; | ||||
} | } | ||||
@@ -97,7 +97,7 @@ if (!function_exists('GetFileUrl')) { | |||||
if (!function_exists('GetFileNewName')) { | if (!function_exists('GetFileNewName')) { | ||||
function GetFileNewName($aid, $typeid, $timetag, $title, $ismake = 0, $rank = 0, $namerule = '', $typedir = '', $money = 0, $filename = '') | function GetFileNewName($aid, $typeid, $timetag, $title, $ismake = 0, $rank = 0, $namerule = '', $typedir = '', $money = 0, $filename = '') | ||||
{ | { | ||||
global $cfg_arc_dirname; | |||||
global $cfg_arc_dirname,$cfg_rewrite; | |||||
$articlename = GetFileName($aid, $typeid, $timetag, $title, $ismake, $rank, $namerule, $typedir, $money, $filename); | $articlename = GetFileName($aid, $typeid, $timetag, $title, $ismake, $rank, $namerule, $typedir, $money, $filename); | ||||
if (preg_match("/\?/", $articlename)) { | if (preg_match("/\?/", $articlename)) { | ||||
return $articlename; | return $articlename; | ||||