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

5
core/modules/forum/src/Plugin/Block/ForumBlockBase.php
View file

@ -9,6 +9,7 @@ namespace Drupal\forum\Plugin\Block;
use Drupal\Core\Access\AccessResult;
use Drupal\Core\Block\BlockBase;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Session\AccountInterface;
use Drupal\Core\Url;
@ -87,14 +88,14 @@ abstract class ForumBlockBase extends BlockBase {
* {@inheritdoc}
*/
public function getCacheContexts() {
return ['user.node_grants:view'];
return Cache::mergeContexts(parent::getCacheContexts(), ['user.node_grants:view']);
}
/**
* {@inheritdoc}
*/
public function getCacheTags() {
return ['node_list'];
return Cache::mergeTags(parent::getCacheTags(), ['node_list']);
}
}

2
core/modules/forum/src/ProxyClass/ForumUninstallValidator.php
View file

@ -2,7 +2,7 @@
/**
* @file
* Contains Drupal\forum\ProxyClass\ForumUninstallValidator.
* Contains \Drupal\forum\ProxyClass\ForumUninstallValidator.
*/
/**

2
core/modules/forum/src/Tests/Migrate/d7/MigrateForumSettingsTest.php
View file

@ -2,7 +2,7 @@
/**
* @file
* Contains \Drupal\forum\Tests\d7\MigrateForumSettingsTest.
* Contains \Drupal\forum\Tests\Migrate\d7\MigrateForumSettingsTest.
*/
namespace Drupal\forum\Tests\Migrate\d7;