From 38527c1da3e5b6e8e1d0e55c0794719a0f71d071 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Mon, 4 Mar 2024 10:44:44 +1300 Subject: [PATCH] FIX Ensure both linkfield and elemental exist before applying extension --- _config/extensions.yml | 10 ++++++++-- code/linkfield/Blocks/LinkFieldTestBlock.php | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/_config/extensions.yml b/_config/extensions.yml index 3bd2790..6f834a6 100644 --- a/_config/extensions.yml +++ b/_config/extensions.yml @@ -48,15 +48,21 @@ BasicElementalPage: Only: moduleexists: 'silverstripe/linkfield' --- - SilverStripe\FrameworkTest\LinkField\PageTypes\LinkFieldTestPage: extensions: - SilverStripe\FrameworkTest\LinkField\Extensions\LinkPageExtension SilverStripe\FrameworkTest\Model\Company: - extensions: + extensions: - SilverStripe\FrameworkTest\LinkField\Extensions\CompanyExtension + +--- +Only: + moduleexists: + - 'silverstripe/linkfield' + - 'dnadesign/silverstripe-elemental' +--- SilverStripe\FrameworkTest\LinkField\Blocks\LinkFieldTestBlock: extensions: - SilverStripe\FrameworkTest\LinkField\Extensions\ElementContentExtension diff --git a/code/linkfield/Blocks/LinkFieldTestBlock.php b/code/linkfield/Blocks/LinkFieldTestBlock.php index e36e3b7..1494b8c 100644 --- a/code/linkfield/Blocks/LinkFieldTestBlock.php +++ b/code/linkfield/Blocks/LinkFieldTestBlock.php @@ -4,6 +4,10 @@ namespace SilverStripe\FrameworkTest\LinkField\Blocks; use DNADesign\Elemental\Models\BaseElement; +if (!class_exists(BaseElement::class)) { + return; +} + class LinkFieldTestBlock extends BaseElement { private static string $table_name = 'LinkFieldTestBlock';