mirror of
https://github.com/wilr/silverstripe-googlesitemaps.git
synced 2024-10-22 11:05:48 +02:00
Merge pull request #153 from wilr/wilr-patch-1
Support falsey values in alter (Fixes #152)
This commit is contained in:
commit
764a8f5bb2
@ -52,14 +52,19 @@ class GoogleSitemapExtension extends DataExtension
|
||||
return false;
|
||||
}
|
||||
|
||||
// Allow override. In this case, since this can return multiple results, we'll use an "and" based policy.
|
||||
// That is if any value is false then the current value will be false. Only only if all are true will we
|
||||
// then return true.
|
||||
// Allow override. invokeWithExtensions will either return a single result (true|false) if defined on the object
|
||||
// or an array if on extensions.
|
||||
$override = $this->owner->invokeWithExtensions('alterCanIncludeInGoogleSitemap', $can);
|
||||
|
||||
if ($override) {
|
||||
if ($override !== null) {
|
||||
if (is_array($override)) {
|
||||
if (!empty($override)) {
|
||||
$can = min($override, $can);
|
||||
}
|
||||
} else {
|
||||
$can = $override;
|
||||
}
|
||||
}
|
||||
|
||||
return $can;
|
||||
}
|
||||
|
@ -60,6 +60,7 @@ class GoogleSitemapTest extends FunctionalTest
|
||||
$this->assertFalse($unused->canIncludeInGoogleSitemap());
|
||||
|
||||
$used = $this->objFromFixture(TestDataObject::class, 'DataObjectTest2');
|
||||
|
||||
$this->assertTrue($used->canIncludeInGoogleSitemap());
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user