From 87080c6fe93582071dbeb398ddb6543ee9a59c1d Mon Sep 17 00:00:00 2001
From: Pavel Dohnal <pavel@mailpoet.com>
Date: Tue, 19 Nov 2019 13:53:59 +0100
Subject: [PATCH] Ensure correct type

[MAILPOET-2535]
---
 lib/Settings/UserFlagsController.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/Settings/UserFlagsController.php b/lib/Settings/UserFlagsController.php
index 2a162bc5c4..3ee5e66f00 100644
--- a/lib/Settings/UserFlagsController.php
+++ b/lib/Settings/UserFlagsController.php
@@ -9,7 +9,7 @@ class UserFlagsController {
 
   /** @var array|null */
   private $data = null;
-  
+
   /** @var array */
   private $defaults;
 
@@ -34,7 +34,11 @@ class UserFlagsController {
 
   function getAll() {
     $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) {