Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Ensure correct type

Browse Source 
[MAILPOET-2535]
This commit is contained in:
Pavel Dohnal
2019-11-19 13:53:59 +01:00
committed by Jack Kitterhing
parent 01f4df87b6
commit 87080c6fe9
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Settings/UserFlagsController.php
View File

@ -9,7 +9,7 @@ class UserFlagsController {
/** @var array|null */ /** @var array|null */
private $data = null; private $data = null;
/** @var array */ /** @var array */
private $defaults; private $defaults;
@ -34,7 +34,11 @@ class UserFlagsController {
function getAll() { function getAll() {
$this->ensureLoaded(); $this->ensureLoaded();
return array_merge($this->defaults, $this->data); $data = $this->data;
if (!is_array($data)) {
$data = [];
}
return array_merge($this->defaults, $data);
} }
function set($name, $value) { function set($name, $value) {