tonyair
/
silverstripe-fulltextsearch
mirror of https://github.com/silverstripe/silverstripe-fulltextsearch
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '4.0' into 4

This commit is contained in:
Steve Boyd 2023-03-02 16:51:03 +13:00
parent cf2fa0ab0c 72dc54b0f8
commit c954b6839b
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Search/Variants/SearchVariantSubsites.php
View File

@ -2,6 +2,7 @@
namespace SilverStripe\FullTextSearch\Search\Variants;
use InvalidArgumentException;
use SilverStripe\Assets\File;
use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\FullTextSearch\Search\Indexes\SearchIndex;
@ -48,7 +49,7 @@ class SearchVariantSubsites extends SearchVariant
public function currentState()
{
return (string) SubsiteState::singleton()->getSubsiteId();
return SubsiteState::singleton()->getSubsiteId();
}
public function reindexStates()
@ -71,6 +72,12 @@ class SearchVariantSubsites extends SearchVariant
return;
}
if (is_numeric($state)) {
$state = (int) $state;
} elseif ($state !== null) {
throw new InvalidArgumentException("Invalid state ID. State ID should be number or null.");
}
// Note: Setting directly to the SubsiteState because we don't want the subsite ID to be persisted
// like Subsite::changeSubsite would do.
SubsiteState::singleton()->setSubsiteId($state);