From 8411029acaa3ef77bef418dacff72f12252698de Mon Sep 17 00:00:00 2001 From: Paul Dwight Date: Thu, 4 Jan 2024 09:51:03 +0000 Subject: [PATCH] wip --- src/Models/Metadata.php | 4 +++- src/Repositories/Behaviours/HandleMetadata.php | 11 +---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/Models/Metadata.php b/src/Models/Metadata.php index b9368d4..6b9ddfa 100644 --- a/src/Models/Metadata.php +++ b/src/Models/Metadata.php @@ -109,7 +109,9 @@ protected function getFallbackValue($columnName) try { // Check if the default site title has been added at all in settings. $siteTitle = TwillAppSettings::getTranslated('seo.metadata.site_title'); - } catch(\Exception $e) {} + } catch (\Exception $e) { + } + return strip_tags($this->meta_describable->$fallbackColumnName).($siteTitle ? ' - '.$siteTitle : ''); } diff --git a/src/Repositories/Behaviours/HandleMetadata.php b/src/Repositories/Behaviours/HandleMetadata.php index 7919e2b..3318c5b 100644 --- a/src/Repositories/Behaviours/HandleMetadata.php +++ b/src/Repositories/Behaviours/HandleMetadata.php @@ -17,9 +17,6 @@ trait HandleMetadata /** * Handle saving of metadata fields from form submission. - * - * @param \A17\Twill\Models\Contracts\TwillModelContract $object - * @param array $fields */ public function afterSaveHandleMetadata(TwillModelContract $object, array $fields) { @@ -39,8 +36,6 @@ public function afterSaveHandleMetadata(TwillModelContract $object, array $field /** * Prepares the metadata fields for the admin form view. * - * @param \A17\Twill\Models\Contracts\TwillModelContract $object - * @param array $fields * * @return array */ @@ -69,7 +64,6 @@ public function getFormFieldsHandleMetadata(TwillModelContract $object, array $f * Filters the full fields array down to just the metadata fields * removes the field prefix and sets the keys correctly for persisting to store. * - * @param array $fields * * @return array */ @@ -90,9 +84,7 @@ protected function getMetadataFields(array $fields) /** * Set default values on fields that require it. * - * @param \A17\Twill\Models\Contracts\TwillModelContract $object - * @param array $fields - * + * @param array $fields * @return array */ protected function setFieldDefaults(TwillModelContract $object, $fields) @@ -110,7 +102,6 @@ protected function setFieldDefaults(TwillModelContract $object, $fields) /** * Determine if the field belongs to the metadata. * - * @param string $key * * @return bool */