From 2fc7a153724f10ad8bfae4a4071b2a41b5dd78a8 Mon Sep 17 00:00:00 2001 From: "Instead of looking elsewhere, it is better to come here together" Date: Wed, 16 Nov 2022 18:22:11 +0800 Subject: [PATCH 1/2] Fixed: #12109 --- app/Presenters/CategoryPresenter.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/Presenters/CategoryPresenter.php b/app/Presenters/CategoryPresenter.php index 5a93d1261..92905a68e 100644 --- a/app/Presenters/CategoryPresenter.php +++ b/app/Presenters/CategoryPresenter.php @@ -82,14 +82,6 @@ class CategoryPresenter extends Presenter "title" => trans('admin/categories/general.use_default_eula_column'), 'visible' => true, "formatter" => 'trueFalseFormatter', - ],[ - "field" => "checkin_email", - "searchable" => false, - "sortable" => true, - "class" => 'css-envelope', - "title" => 'Send Email', - "visible" => true, - "formatter" => 'trueFalseFormatter', ],[ "field" => "require_acceptance", "searchable" => false, From 5df76155ce484a5d49280791edee24cfd1c4b44f Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 16 Nov 2022 15:53:16 +0000 Subject: [PATCH 2/2] Check for the `format` index in the `$data` array when creating a new custom field via API Signed-off-by: snipe --- app/Http/Controllers/Api/CustomFieldsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/CustomFieldsController.php b/app/Http/Controllers/Api/CustomFieldsController.php index d13716495..688e1146f 100644 --- a/app/Http/Controllers/Api/CustomFieldsController.php +++ b/app/Http/Controllers/Api/CustomFieldsController.php @@ -96,7 +96,7 @@ class CustomFieldsController extends Controller $data = $request->all(); $regex_format = null; - if (str_contains($data['format'], 'regex:')) { + if ((array_key_exists('format', $data)) && (str_contains($data['format'], 'regex:'))) { $regex_format = $data['format']; }