diff --git a/module/admin/js/register.ui.js b/module/admin/js/register.ui.js index 7945a4a706..e90017fe9e 100644 --- a/module/admin/js/register.ui.js +++ b/module/admin/js/register.ui.js @@ -106,7 +106,7 @@ window.getFingerprint = function() window.skip = function() { - ajaxInstallEvent('click-skip-join-community'); + ajaxInstallEvent('click-skip'); setTimeout(function() { location.href = $.createLink('index', 'index'); }, 1000); diff --git a/module/install/js/index.ui.js b/module/install/js/index.ui.js index fd834f44ae..bc7753b1f3 100644 --- a/module/install/js/index.ui.js +++ b/module/install/js/index.ui.js @@ -5,4 +5,4 @@ window.switchLang = function(lang) $.ajax({url: $.createLink('misc', 'ajaxSendEvent', "step=start"), timeout: 2000}); -ajaxInstallEvent('start-install'); +ajaxInstallEvent('start'); diff --git a/module/install/js/step6.ui.js b/module/install/js/step6.ui.js index 0a5b043471..690f76b959 100644 --- a/module/install/js/step6.ui.js +++ b/module/install/js/step6.ui.js @@ -1,3 +1,3 @@ $.ajax({url: sendEventLink, timeout: 2000}); -ajaxInstallEvent('finish-install'); +ajaxInstallEvent('finish'); diff --git a/module/setting/model.php b/module/setting/model.php index 976b945996..3ae18a01e8 100644 --- a/module/setting/model.php +++ b/module/setting/model.php @@ -333,7 +333,6 @@ class settingModel extends model $sn = $this->computeSN(); setCookie('sn', $sn); } - } else {