diff --git a/core/default_settings/default_settings_reload.php b/core/default_settings/default_settings_reload.php index 5de9fea158..1732c1c6de 100644 --- a/core/default_settings/default_settings_reload.php +++ b/core/default_settings/default_settings_reload.php @@ -39,6 +39,7 @@ else { $text = $language->get(); $search = $_REQUEST['search']; +$domain_uuid = $_GET['id']; require "resources/classes/domains.php"; $domain = new domains(); @@ -46,6 +47,12 @@ $domain->db = $db; $domain->set(); message::add($text['message-settings_reloaded']); -header("Location: default_settings.php".($search != '' ? "?search=".$search : null)); +if (is_uuid($domain_uuid)) { + $location = PROJECT_PATH.'/core/domains/domain_edit.php?id='.$domain_uuid; +} +else { + $location = 'default_settings.php'.($search != '' ? "?search=".$search : null); +} +header("Location: ".$location); ?> \ No newline at end of file diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php index ecd3e95d9d..93fac4d8e7 100644 --- a/core/domain_settings/domain_settings.php +++ b/core/domain_settings/domain_settings.php @@ -385,7 +385,7 @@ echo "
\n"; if (permission_exists('domain_setting_add')) { - echo " "; + echo ""; } if (is_array($result) && @sizeof($result) != 0) { if (permission_exists("domain_select") && permission_exists("domain_setting_add") && count($_SESSION['domains']) > 1) { @@ -411,6 +411,9 @@ echo " "; } } + if (permission_exists('default_setting_view') && is_array($result) && @sizeof($result) != 0) { + echo button::create(['type'=>'button','label'=>$text['button-reload'],'icon'=>$_SESSION['theme']['button_icon_reload'],'style'=>'margin-left: 15px;','link'=>PROJECT_PATH.'/core/default_settings/default_settings_reload.php?id='.$domain_uuid]); + } echo "
\n"; echo "".$text['header-domain_settings'].""; echo "

\n";