From cb0788cbb11b9fd1878f7355afedcdd25f8a2157 Mon Sep 17 00:00:00 2001 From: Alex <40072887+alexdcrane@users.noreply.github.com> Date: Wed, 29 Apr 2026 22:57:37 +0000 Subject: [PATCH] Exclude category in search form (#7941) A category select box is already in the form --- core/default_settings/default_settings.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php index f676ca25a..b6dfb07fe 100644 --- a/core/default_settings/default_settings.php +++ b/core/default_settings/default_settings.php @@ -83,23 +83,23 @@ $list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false); // Build the query string - $param = []; + $url_params = []; if (!empty($_GET['order_by'])) { - $param['order_by'] = $order_by; + $url_params['order_by'] = $order_by; } if (!empty($_GET['order'])) { - $param['order'] = $order; + $url_params['order'] = $order; } if (!empty($search)) { - $param['search'] = $search; + $url_params['search'] = $search; } if (!empty($show) && $show == 'all' && permission_exists('stream_all')) { - $param['show'] = $show; + $url_params['show'] = $show; } if (!empty($default_setting_category)) { - $param['default_setting_category'] = $default_setting_category; + $url_params['default_setting_category'] = $default_setting_category; } - $query_string = http_build_query($param); + $query_string = http_build_query($url_params); //process the http post data by action if (!empty($action) && !empty($default_settings)) { @@ -308,7 +308,7 @@ echo button::create(['type'=>'button','label'=>$text['label-domain'],'icon'=>$settings->get('theme', 'button_icon_domain'),'style'=>'','link'=>PROJECT_PATH.'/core/domain_settings/domain_settings.php?id='.$domain_uuid]); echo button::create(['label'=>$text['button-reload'],'icon'=>$settings->get('theme', 'button_icon_reload'),'type'=>'button','id'=>'button_reload','link'=>'default_settings_reload.php'.($query_string ? '?'.$query_string : ''),'style'=>'margin-right: 15px;']); if ($permission['default_setting_add']) { - echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$settings->get('theme', 'button_icon_add'),'id'=>'btn_add','link'=>'default_setting_edit.php'.($query_string ? '?'.$query_string : '')]); + echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$settings->get('theme', 'button_icon_add'),'id'=>'btn_add','link'=>'default_setting_edit.php']); } if ($permission['default_setting_add'] && !empty($default_settings)) { if ($permission['domain_select'] && $permission['domain_setting_add']) { @@ -331,13 +331,13 @@ echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$settings->get('theme', 'button_icon_delete'),'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"modal_open('modal-delete','btn_delete');"]); } echo "