From a3d2a17f5f49ebee3eb915987a527eebdc473bd7 Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Tue, 30 Jan 2024 18:54:53 +0000 Subject: [PATCH] Don't set termTemplate and template if they are the defaults --- .../CP/Taxonomies/TaxonomiesController.php | 4 ++-- src/Taxonomies/Taxonomy.php | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php b/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php index 06da6e4af9..82cb5289bb 100644 --- a/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php +++ b/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php @@ -133,8 +133,8 @@ public function edit($taxonomy) 'collections' => $taxonomy->collections()->map->handle()->all(), 'sites' => $taxonomy->sites()->all(), 'preview_targets' => $taxonomy->basePreviewTargets(), - 'term_template' => $taxonomy->termTemplate(), - 'template' => $taxonomy->template(), + 'term_template' => $taxonomy->termTemplate, + 'template' => $taxonomy->template, 'layout' => $taxonomy->layout(), ]; diff --git a/src/Taxonomies/Taxonomy.php b/src/Taxonomies/Taxonomy.php index 9b689730de..dccfcc731a 100644 --- a/src/Taxonomies/Taxonomy.php +++ b/src/Taxonomies/Taxonomy.php @@ -383,6 +383,13 @@ public function termTemplate($termTemplate = null) return $termTemplate; }) + ->setter(function ($termTemplate) { + if (! $termTemplate) { + return; + } + + return $termTemplate; + }) ->args(func_get_args()); } @@ -403,6 +410,13 @@ public function template($template = null) return $template; }) + ->setter(function ($template) { + if (! $template) { + return; + } + + return $template; + }) ->args(func_get_args()); }