From 2860c390b06969f4742c78978f43f31f26a0747a Mon Sep 17 00:00:00 2001 From: Will Rossiter Date: Tue, 30 Apr 2019 15:45:39 +1200 Subject: [PATCH] If invokeWithExtensions returns an empty array, don't override --- src/Extensions/GoogleSitemapExtension.php | 4 +++- tests/GoogleSitemapTest.php | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Extensions/GoogleSitemapExtension.php b/src/Extensions/GoogleSitemapExtension.php index 72c7ba1..1e89eba 100644 --- a/src/Extensions/GoogleSitemapExtension.php +++ b/src/Extensions/GoogleSitemapExtension.php @@ -58,7 +58,9 @@ class GoogleSitemapExtension extends DataExtension if ($override !== null) { if (is_array($override)) { - $can = min($override, $can); + if (!empty($override)) { + $can = min($override, $can); + } } else { $can = $override; } diff --git a/tests/GoogleSitemapTest.php b/tests/GoogleSitemapTest.php index 56f022b..9faa31a 100644 --- a/tests/GoogleSitemapTest.php +++ b/tests/GoogleSitemapTest.php @@ -60,6 +60,7 @@ class GoogleSitemapTest extends FunctionalTest $this->assertFalse($unused->canIncludeInGoogleSitemap()); $used = $this->objFromFixture(TestDataObject::class, 'DataObjectTest2'); + $this->assertTrue($used->canIncludeInGoogleSitemap()); }