Skip to content

Commit

Permalink
Merge pull request #18 from discoverygarden/fix/d10-support
Browse files Browse the repository at this point in the history
D10-28: Add D10, and fix an `::accessCheck()` thing.
  • Loading branch information
nchiasson-dgi authored Sep 22, 2023
2 parents 5cce3c4 + 63b0252 commit 01f07e2
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion embargo.info.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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])) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: []

0 comments on commit 01f07e2

Please sign in to comment.