diff --git a/modules/autoinstall/autoinstall.admin.model.php b/modules/autoinstall/autoinstall.admin.model.php index 897160634..0f1c1ec8a 100644 --- a/modules/autoinstall/autoinstall.admin.model.php +++ b/modules/autoinstall/autoinstall.admin.model.php @@ -432,8 +432,8 @@ class autoinstallAdminModel extends autoinstall $_download_server = 'https://download.xpressengine.com/'; $config = new stdClass(); - $config->location_site = $config_info->location_site ? $config_info->location_site : $_location_site; - $config->download_server = $config_info->download_server ? $config_info->download_server : $_download_server; + $config->location_site = ($config_info->location_site ?? null) ?: $_location_site; + $config->download_server = ($config_info->download_server ?? null) ?: $_download_server; return $config; } diff --git a/modules/autoinstall/autoinstall.model.php b/modules/autoinstall/autoinstall.model.php index 3165c913b..cc0031031 100644 --- a/modules/autoinstall/autoinstall.model.php +++ b/modules/autoinstall/autoinstall.model.php @@ -349,13 +349,13 @@ class autoinstallModel extends autoinstall $path = substr($path, 0, strlen($path) - 1); } - if(!$GLOBALS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path]) + if(empty($GLOBALS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path])) { $args = new stdClass(); $args->path = $path; $output = executeQuery('autoinstall.getPackageSrlByPath', $args); - $GLOBALS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path] = $output->data->package_srl; + $GLOBALS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path] = $output->data->package_srl ?? null; } return $GLOBALS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path]; diff --git a/modules/board/tpl/board_setup_basic.html b/modules/board/tpl/board_setup_basic.html index c959c5e61..3f9917067 100644 --- a/modules/board/tpl/board_setup_basic.html +++ b/modules/board/tpl/board_setup_basic.html @@ -2,6 +2,7 @@ +{@ if(!isset($member_config)) $member_config = MemberModel::getMemberConfig()}