diff --git a/core/modules/node/lib/Drupal/node/Access/NodeRevisionAccessCheck.php b/core/modules/node/lib/Drupal/node/Access/NodeRevisionAccessCheck.php index 02ab949..822b404 100644 --- a/core/modules/node/lib/Drupal/node/Access/NodeRevisionAccessCheck.php +++ b/core/modules/node/lib/Drupal/node/Access/NodeRevisionAccessCheck.php @@ -137,6 +137,7 @@ public function checkAccess(NodeInterface $node, AccountInterface $account, $op // Perform basic permission checks first. if (!user_access($map[$op], $account) && !user_access($type_map[$op], $account) && !user_access('administer nodes', $account)) { $this->access[$cid] = FALSE; + return FALSE; } // There should be at least two revisions. If the vid of the given node diff --git a/core/tests/Drupal/Tests/Core/Access/CustomAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Access/CustomAccessCheckTest.php index 7a5676b..8144c23 100644 --- a/core/tests/Drupal/Tests/Core/Access/CustomAccessCheckTest.php +++ b/core/tests/Drupal/Tests/Core/Access/CustomAccessCheckTest.php @@ -95,13 +95,13 @@ public function testAccess() { $route = new Route('/test-route', array(), array('_custom_access' => '\Drupal\Tests\Core\Access\TestController::accessDeny')); $account = $this->getMock('Drupal\Core\Session\AccountInterface'); - $this->assertNull($this->accessChecker->access($route, $request, $account)); + $this->assertSame(AccessInterface::DENY, $this->accessChecker->access($route, $request, $account)); $route = new Route('/test-route', array(), array('_custom_access' => '\Drupal\Tests\Core\Access\TestController::accessAllow')); - $this->assertTrue($this->accessChecker->access($route, $request, $account)); + $this->assertSame(AccessInterface::ALLOW, $this->accessChecker->access($route, $request, $account)); $route = new Route('/test-route', array('parameter' => 'TRUE'), array('_custom_access' => '\Drupal\Tests\Core\Access\TestController::accessParameter')); - $this->assertTrue($this->accessChecker->access($route, $request, $account)); + $this->assertSame(AccessInterface::ALLOW, $this->accessChecker->access($route, $request, $account)); } } diff --git a/core/tests/Drupal/Tests/Core/Access/DefaultAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Access/DefaultAccessCheckTest.php index 89c845a..a2fce18 100644 --- a/core/tests/Drupal/Tests/Core/Access/DefaultAccessCheckTest.php +++ b/core/tests/Drupal/Tests/Core/Access/DefaultAccessCheckTest.php @@ -7,6 +7,7 @@ namespace Drupal\Tests\Core\Access; +use Drupal\Core\Access\AccessInterface; use Drupal\Core\Access\DefaultAccessCheck; use Drupal\Tests\UnitTestCase; use Symfony\Component\HttpFoundation\Request; @@ -66,13 +67,13 @@ public function testAccess() { $request = new Request(array()); $route = new Route('/test-route', array(), array('_access' => 'NULL')); - $this->assertNull($this->accessChecker->access($route, $request, $this->account)); + $this->assertSame(AccessInterface::DENY, $this->accessChecker->access($route, $request, $this->account)); $route = new Route('/test-route', array(), array('_access' => 'FALSE')); - $this->assertFalse($this->accessChecker->access($route, $request, $this->account)); + $this->assertSame(AccessInterface::KILL, $this->accessChecker->access($route, $request, $this->account)); $route = new Route('/test-route', array(), array('_access' => 'TRUE')); - $this->assertTrue($this->accessChecker->access($route, $request, $this->account)); + $this->assertSame(AccessInterface::ALLOW, $this->accessChecker->access($route, $request, $this->account)); } }