opensourcemirror
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #18262 from nextcloud/bugfix/noid/workflow-eventnames-fallback 

Make sure event names is always an array
This commit is contained in:
Roeland Jago Douma 2019-12-06 11:36:56 +01:00 committed by GitHub
parent da84b36186 c3061e6929
commit 6caec491c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/workflowengine/lib/AppInfo/Application.php
View File

@ -127,7 +127,7 @@ class Application extends \OCP\AppFramework\App {
}
}
);
}, $eventNames);
}, $eventNames ?? []);
}
}
}

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

@ -145,7 +145,7 @@ class Manager implements IManager {
$operations[$operation] = $operations[$row['class']] ?? [];
$operations[$operation][$entity] = $operations[$operation][$entity] ?? [];
$operations[$operation][$entity] = array_unique(array_merge($operations[$operation][$entity], $eventNames));
$operations[$operation][$entity] = array_unique(array_merge($operations[$operation][$entity], $eventNames ?? []));
}
$result->closeCursor();
@ -589,7 +589,7 @@ class Manager implements IManager {
$operation['checks'][] = $check;
}
$operation['events'] = json_decode($operation['events'], true);
$operation['events'] = json_decode($operation['events'], true) ?? [];
return $operation;