Flows that are managing themselves do not necessarily set the entity

for instance files_automatedtagging, which works on a lower level. Fixes a
Call to a member function isLegitimatedForUserId() on null.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2019-12-18 09:35:03 +01:00
parent 34c48aaa92
commit 0a00903261
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
1 changed files with 10 additions and 8 deletions

View File

@ -121,14 +121,16 @@ class RuleMatcher implements IRuleMatcher {
$operations = array_merge($operations, $this->manager->getOperations($class, $scope)); $operations = array_merge($operations, $this->manager->getOperations($class, $scope));
} }
$additionalScopes = $this->manager->getAllConfiguredScopesForOperation($class); if($this->entity instanceof IEntity) {
foreach ($additionalScopes as $hash => $scopeCandidate) { $additionalScopes = $this->manager->getAllConfiguredScopesForOperation($class);
/** @var ScopeContext $scopeCandidate */ foreach ($additionalScopes as $hash => $scopeCandidate) {
if ($scopeCandidate->getScope() !== IManager::SCOPE_USER || in_array($scopeCandidate, $scopes)) { /** @var ScopeContext $scopeCandidate */
continue; if ($scopeCandidate->getScope() !== IManager::SCOPE_USER || in_array($scopeCandidate, $scopes)) {
} continue;
if ($this->entity->isLegitimatedForUserId($scopeCandidate->getScopeId())) { }
$operations = array_merge($operations, $this->manager->getOperations($class, $scopeCandidate)); if ($this->entity->isLegitimatedForUserId($scopeCandidate->getScopeId())) {
$operations = array_merge($operations, $this->manager->getOperations($class, $scopeCandidate));
}
} }
} }