diff --git a/embargo.info.yml b/embargo.info.yml index 92c9fbc..53b1b95 100644 --- a/embargo.info.yml +++ b/embargo.info.yml @@ -1,7 +1,7 @@ name: Embargo description: 'Embargo content indefinitely or till specified date, limiting access to specific users and/or IP addresses.' type: module -core_version_requirement: ^9 +core_version_requirement: ^9 || ^10 configure: embargo.settings dependencies: - drupal:datetime diff --git a/modules/migrate_embargoes_to_embargo/migrate_embargoes_to_embargo.info.yml b/modules/migrate_embargoes_to_embargo/migrate_embargoes_to_embargo.info.yml index b49ed0a..2cb0cb9 100644 --- a/modules/migrate_embargoes_to_embargo/migrate_embargoes_to_embargo.info.yml +++ b/modules/migrate_embargoes_to_embargo/migrate_embargoes_to_embargo.info.yml @@ -5,6 +5,6 @@ description: > Migrations and plugins to handle migrating from the older "embargoes" module to this newer "embargo" module. package: Embargo -core_version_requirement: ^9 +core_version_requirement: ^9 || ^10 dependencies: - embargo:embargo diff --git a/modules/migrate_embargoes_to_embargo/src/Plugin/migrate/source/Entity.php b/modules/migrate_embargoes_to_embargo/src/Plugin/migrate/source/Entity.php index 2560484..19756df 100644 --- a/modules/migrate_embargoes_to_embargo/src/Plugin/migrate/source/Entity.php +++ b/modules/migrate_embargoes_to_embargo/src/Plugin/migrate/source/Entity.php @@ -128,7 +128,10 @@ protected function initializeIterator() { // particularly large number of them; however, we do not expect this to be // used with terribly many at the moment... like only 10s or 100s. $storage = $this->getStorage(); - foreach ($storage->getQuery()->execute() as $id) { + $results = $storage->getQuery() + ->accessCheck() + ->execute(); + foreach ($results as $id) { $array = $storage->load($id)->toArray(); foreach ($this->getIds() as $key => $info) { if (is_array($array[$key])) { diff --git a/modules/migrate_embargoes_to_embargo/tests/modules/migrate_embargoes_to_embargo_embargoes_permission_test_proxy/migrate_embargoes_to_embargo_embargoes_permission_test_proxy.info.yml b/modules/migrate_embargoes_to_embargo/tests/modules/migrate_embargoes_to_embargo_embargoes_permission_test_proxy/migrate_embargoes_to_embargo_embargoes_permission_test_proxy.info.yml index 6a8eb56..04e8393 100644 --- a/modules/migrate_embargoes_to_embargo/tests/modules/migrate_embargoes_to_embargo_embargoes_permission_test_proxy/migrate_embargoes_to_embargo_embargoes_permission_test_proxy.info.yml +++ b/modules/migrate_embargoes_to_embargo/tests/modules/migrate_embargoes_to_embargo_embargoes_permission_test_proxy/migrate_embargoes_to_embargo_embargoes_permission_test_proxy.info.yml @@ -3,7 +3,7 @@ name: Embargoes permissions proxy description: > Container for the 'embargoes' permissions, to avoid created a dependency on a module we are replacing. -core_version_requirement: ^9 +core_version_requirement: ^9 || ^10 type: module hidden: true dependencies: []