opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.1.0. For more information, see https://www.drupal.org/drupal-8.1.0-release-notes

Browse source
This commit is contained in:
Pantheon Automation 2016-04-20 09:56:34 -07:00 • committed by Greg Anderson
parent b11a755ba8
commit c0a0d5a94c
6920 changed files with 64395 additions and 57312 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/modules/block/src/BlockAccessControlHandler.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\block\BlockAccessControlHandler.
*/
namespace Drupal\block;
use Drupal\Component\Plugin\Exception\ContextException;
@ -96,7 +91,7 @@ class BlockAccessControlHandler extends EntityAccessControlHandler implements En
// Don't grant access to disabled blocks.
if (!$entity->status()) {
return AccessResult::forbidden()->cacheUntilEntityChanges($entity);
return AccessResult::forbidden()->addCacheableDependency($entity);
}
else {
$conditions = [];
@ -151,7 +146,7 @@ class BlockAccessControlHandler extends EntityAccessControlHandler implements En
$this->mergeCacheabilityFromConditions($access, $conditions);
// Ensure that access is evaluated again when the block changes.
return $access->cacheUntilEntityChanges($entity);
return $access->addCacheableDependency($entity);
}
}