Mercurial > hg > isophonics-drupal-site

diff core/modules/menu_link_content/src/MenuLinkContentAccessControlHandler.php @ 17:129ea1e6d783

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update, including to Drupal core 8.6.10
author Chris Cannam
date Thu, 28 Feb 2019 13:21:36 +0000
parents 4c8ae668cc8c
children
line wrap: on
line diff
--- a/core/modules/menu_link_content/src/MenuLinkContentAccessControlHandler.php	Tue Jul 10 15:07:59 2018 +0100
+++ b/core/modules/menu_link_content/src/MenuLinkContentAccessControlHandler.php	Thu Feb 28 13:21:36 2019 +0000
@@ -72,7 +72,8 @@
         }
 
       case 'delete':
-        return AccessResult::allowedIf(!$entity->isNew() && $account->hasPermission('administer menu'))->cachePerPermissions()->addCacheableDependency($entity);
+        return AccessResult::allowedIfHasPermission($account, 'administer menu')
+          ->andIf(AccessResult::allowedIf(!$entity->isNew())->addCacheableDependency($entity));
     }
   }