From cf07186ae8704d609c65c7f91db67af9a2963c76 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 3 Sep 2024 12:23:23 -0700 Subject: [PATCH] gives priority to default eula being checked vs catregory eula --- app/Models/Asset.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Models/Asset.php b/app/Models/Asset.php index dd2f1c8e22..aff06b6689 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -950,11 +950,12 @@ class Asset extends Depreciable { if (($this->model) && ($this->model->category)) { - if ($this->model->category->eula_text) { + if (($this->model->category->eula_text) && ($this->model->category->use_default_eula === 0)) { return Helper::parseEscapedMarkedown($this->model->category->eula_text); - } elseif ($this->model->category->use_default_eula == '1') { + } elseif ($this->model->category->use_default_eula === 1) { return Helper::parseEscapedMarkedown(Setting::getSettings()->default_eula_text); } else { + return false; } }