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

Update to Drupal 8.0.0-rc3. For more information, see https://www.drupal.org/node/2608078

Browse source
This commit is contained in:
Pantheon Automation 2015-11-04 11:11:27 -08:00 • committed by Greg Anderson
parent 6419a031d7
commit 4afb23bbd3
762 changed files with 20080 additions and 6368 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/modules/help/src/Plugin/Block/HelpBlock.php
View file

@ -8,6 +8,7 @@
namespace Drupal\help\Plugin\Block;
use Drupal\Core\Block\BlockBase;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Routing\RouteMatchInterface;
@ -120,7 +121,7 @@ class HelpBlock extends BlockBase implements ContainerFactoryPluginInterface {
public function getCacheContexts() {
// The "Help" block must be cached per URL: help is defined for a
// given path, and does not come with any access restrictions.
return array('url');
return Cache::mergeContexts(parent::getCacheContexts(), ['url']);
}
}