diff --git a/core/lib/Drupal/Core/Access/AccessManager.php b/core/lib/Drupal/Core/Access/AccessManager.php index 7a9eb9a..d5fd047 100644 --- a/core/lib/Drupal/Core/Access/AccessManager.php +++ b/core/lib/Drupal/Core/Access/AccessManager.php @@ -103,7 +103,7 @@ protected function applies(Route $route) { public function check(Route $route, Request $request) { $checks = $route->getOption('_access_checks') ?: array(); - $conjunction = $route->getOption('_access_conjunction') ?: 'ANY'; + $conjunction = $route->getOption('_access_mode') ?: 'ANY'; if ($conjunction == 'ALL') { return $this->checkAll($checks, $route, $request); diff --git a/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php b/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php index 1b77ab7..0edad21 100644 --- a/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php @@ -122,7 +122,7 @@ public function testCheck() { * @return array * An array of data for check conjunctions. * - * @see \Drupal\Tests\Core\Access\AccessManagerTest::testCHeckConjunctions() + * @see \Drupal\Tests\Core\Access\AccessManagerTest::testCheckConjunctions() */ public function checkConjunctionsProvider() { $access_configurations = array(); @@ -233,7 +233,7 @@ public function testCheckConjunctions($conjunction, $name, $condition_one, $cond '_access' => static::convertAccessCheckInterfaceToString($condition_one), '_test_access' => static::convertAccessCheckInterfaceToString($condition_two), ); - $options = array('_access_conjunction' => $conjunction); + $options = array('_access_mode' => $conjunction); $route = new Route($name, array(), $requirements, $options); $route_collection->add($name, $route);