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

6
core/lib/Drupal/Core/Menu/MenuTreeStorageInterface.php
View file

@ -71,11 +71,11 @@ interface MenuTreeStorageInterface {
* @param array $properties
* The properties to filter by.
*
* @throws \InvalidArgumentException
* Thrown if an invalid property name is specified in $properties.
*
* @return array
* An array of menu link definition arrays.
*
* @throws \InvalidArgumentException
* Thrown if an invalid property name is specified in $properties.
*/
public function loadByProperties(array $properties);

5
core/lib/Drupal/Core/Menu/Plugin/Block/LocalActionsBlock.php
View file

@ -2,12 +2,13 @@
/**
* @file
* Contains \Drupal\Core\Plugin\Block\LocalActionsBlock.
* Contains \Drupal\Core\Menu\Plugin\Block\LocalActionsBlock.
*/
namespace Drupal\Core\Menu\Plugin\Block;
use Drupal\Core\Block\BlockBase;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Menu\LocalActionManagerInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
@ -94,7 +95,7 @@ class LocalActionsBlock extends BlockBase implements ContainerFactoryPluginInter
* {@inheritdoc}
*/
public function getCacheContexts() {
return ['route'];
return Cache::mergeContexts(parent::getCacheContexts(), ['route']);
}
}