diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-12-16 20:29:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-16 20:29:53 +0100 |
| commit | 2df9073025f47451600b7764ea92788056abdb6f (patch) | |
| tree | 129d83e9714b4e6d8872bbfe12ab1461fb752fb3 | |
| parent | 9fee1d9851eeef423ba3e924ecc080a1b0562636 (diff) | |
| parent | 8b18b0c97d5c3a915bffaf33c50780ecdc0d297d (diff) | |
| download | nextcloud-server-2df9073025f47451600b7764ea92788056abdb6f.tar.gz nextcloud-server-2df9073025f47451600b7764ea92788056abdb6f.zip | |
Merge pull request #18430 from nextcloud/fix/noid/double-flow
Fix/noid/double flow
| -rw-r--r-- | apps/workflowengine/lib/AppInfo/Application.php | 2 | ||||
| -rw-r--r-- | apps/workflowengine/lib/Service/RuleMatcher.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/workflowengine/lib/AppInfo/Application.php b/apps/workflowengine/lib/AppInfo/Application.php index 2d04e2a1bf9..74a7c841ee7 100644 --- a/apps/workflowengine/lib/AppInfo/Application.php +++ b/apps/workflowengine/lib/AppInfo/Application.php @@ -110,7 +110,7 @@ class Application extends \OCP\AppFramework\App { $operation->onEventCompat($eventName, $event, $ruleMatcher); } else { $logger = $this->getContainer()->getServer()->getLogger(); - $logger->warning( + $logger->debug( 'Cannot handle event {name} of {event} against entity {entity} and operation {operation}', [ 'app' => self::APP_ID, diff --git a/apps/workflowengine/lib/Service/RuleMatcher.php b/apps/workflowengine/lib/Service/RuleMatcher.php index b08bcbbe56b..6186df1d7b9 100644 --- a/apps/workflowengine/lib/Service/RuleMatcher.php +++ b/apps/workflowengine/lib/Service/RuleMatcher.php @@ -124,7 +124,7 @@ class RuleMatcher implements IRuleMatcher { $additionalScopes = $this->manager->getAllConfiguredScopesForOperation($class); foreach ($additionalScopes as $hash => $scopeCandidate) { /** @var ScopeContext $scopeCandidate */ - if ($scopeCandidate->getScope() !== IManager::SCOPE_USER) { + if ($scopeCandidate->getScope() !== IManager::SCOPE_USER || in_array($scopeCandidate, $scopes)) { continue; } if ($this->entity->isLegitimatedForUserId($scopeCandidate->getScopeId())) { |