mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #18509 from nextcloud/fix/noid/flow-blank-settings-custom-entity 

Flow: report list of entities without array keys to frontend
This commit is contained in:
Roeland Jago Douma 2019-12-23 11:34:07 +01:00 committed by GitHub
parent f8349208eb 2799064573
commit 6d96b34784
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/workflowengine/lib/Manager.php
View File

@ -601,7 +601,7 @@ class Manager implements IManager {
public function getEntitiesList(): array { public function getEntitiesList(): array {
$this->eventDispatcher->dispatch(IManager::EVENT_NAME_REG_ENTITY, new GenericEvent($this)); $this->eventDispatcher->dispatch(IManager::EVENT_NAME_REG_ENTITY, new GenericEvent($this));
return array_merge($this->getBuildInEntities(), $this->registeredEntities); return array_values(array_merge($this->getBuildInEntities(), $this->registeredEntities));
} }
/** /**
@ -640,7 +640,7 @@ class Manager implements IManager {
protected function getBuildInEntities(): array { protected function getBuildInEntities(): array {
try { try {
return [ return [
$this->container->query(File::class), File::class => $this->container->query(File::class),
]; ];
} catch (QueryException $e) { } catch (QueryException $e) {
$this->logger->logException($e); $this->logger->logException($e);