Commit 0b0aef57 authored by Nikolay Lobachev's avatar Nikolay Lobachev
Browse files

Issue #3322496 by ekes: Permissions are only additive

parent 88699835

src/Access/GroupPermissionsChainPermissionCalculator.php

+0 −7
Changes for src/Access/GroupPermissionsChainPermissionCalculator.php: 0 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ use Drupal\Core\Cache\CacheableMetadata; 
use Drupal\Core\Session\AccountInterface;

use Drupal\flexible_permissions\CalculatedPermissions;

use Drupal\flexible_permissions\ChainPermissionCalculator;

use Drupal\flexible_permissions\RefinableCalculatedPermissions;

use Drupal\group\Access\SynchronizedGroupPermissionCalculator;



/**

 * Collects group permissions for an account.
@@ -72,11 +70,6 @@ class GroupPermissionsChainPermissionCalculator extends ChainPermissionCalculato 
        $calculated_permissions = $calculated_permissions->merge($calculator->calculatePermissions($account, $scope), $overwrite);

      }



      $calculated_permissions = new RefinableCalculatedPermissions();

      foreach ($this->getCalculators() as $calculator) {

        $calculated_permissions = $calculated_permissions->merge($calculator->calculatePermissions($account, $scope));

      }



      // Apply a cache tag to easily flush the calculated permissions.

      $calculated_permissions->addCacheTags(['flexible_permissions']);

    }