Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue 2102916: follow up by Berdir, HEAD Broken.

8.0.x
Nathaniel Catchpole 2013-06-12 17:40:09 +01:00
parent 202fe604b4
commit 2db9d595dd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/modules/menu_link/lib/Drupal/menu_link/MenuLinkAccessController.php
View File

@ -9,7 +9,7 @@ namespace Drupal\menu_link;
use Drupal\Core\Entity\EntityAccessController; use Drupal\Core\Entity\EntityAccessController;
use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityInterface;
use Drupal\user\Plugin\Core\Entity\User; use Drupal\Core\Session\AccountInterface;
/** /**
* Defines an access controller for the menu link entity. * Defines an access controller for the menu link entity.
@ -21,7 +21,7 @@ class MenuLinkAccessController extends EntityAccessController {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
protected function checkAccess(EntityInterface $entity, $operation, $langcode, User $account) { protected function checkAccess(EntityInterface $entity, $operation, $langcode, AccountInterface $account) {
$access = user_access('administer menu', $account); $access = user_access('administer menu', $account);
if ($access && $operation == 'delete') { if ($access && $operation == 'delete') {
// Only items created by the menu module can be deleted. // Only items created by the menu module can be deleted.

4
core/modules/system/lib/Drupal/system/MenuAccessController.php
View File

@ -9,7 +9,7 @@ namespace Drupal\system;
use Drupal\Core\Entity\EntityAccessController; use Drupal\Core\Entity\EntityAccessController;
use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityInterface;
use Drupal\user\Plugin\Core\Entity\User; use Drupal\Core\Session\AccountInterface;
/** /**
* Defines an access controller for the menu entity. * Defines an access controller for the menu entity.
@ -21,7 +21,7 @@ class MenuAccessController extends EntityAccessController {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
protected function checkAccess(EntityInterface $entity, $operation, $langcode, User $account) { protected function checkAccess(EntityInterface $entity, $operation, $langcode, AccountInterface $account) {
if ($operation == 'delete') { if ($operation == 'delete') {
// System-defined menus may not be deleted. // System-defined menus may not be deleted.
// @todo Refactor https://drupal.org/node/1882552 // @todo Refactor https://drupal.org/node/1882552