Don't nest AutoDatasources inside of other AutoDatasources.

Refs / requires: wintercms/winter@cfb8cdf
wintercms · Sep 27, 2023 · 4e8dfa9 · 4e8dfa9
1 parent f94479a
commit 4e8dfa9
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/Plugin.php b/Plugin.php
@@ -113,10 +113,17 @@ protected function extendThemeDatasource(): void
  // Register the block manager instance
  BlockManager::instance();
  Event::listen('cms.theme.registerHalcyonDatasource', function (Theme $theme, $resolver) {
- $resolver->addDatasource($theme->getDirName(), new AutoDatasource([
- 'theme' => $theme->getDatasource(),
- 'blocks' => new BlocksDatasource(),
- ], 'blocks-autodatasource'));
+ $source = $theme->getDatasource();
+ if ($source instanceof AutoDatasource) {
+ /* @var AutoDatasource $source */
+ $source->appendDatasource('blocks', new BlocksDatasource());
+ return;
+ } else {
+ $resolver->addDatasource($theme->getDirName(), new AutoDatasource([
+ 'theme' => $source,
+ 'blocks' => new BlocksDatasource(),
+ ], 'blocks-autodatasource'));
+ }
  });
  }