From 4c43408e8b70f9b0e8f204f24ec42049b122e06f Mon Sep 17 00:00:00 2001
From: Rick van Beek <rick.vanbeek@iodigital.com>
Date: Thu, 4 Jul 2024 11:40:47 +0200
Subject: [PATCH] Fix null type check for array in plugin

---
 Plugin/Widget/Controller/Adminhtml/Widget/LoadOptions.php | 2 +-
 composer.json                                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Plugin/Widget/Controller/Adminhtml/Widget/LoadOptions.php b/Plugin/Widget/Controller/Adminhtml/Widget/LoadOptions.php
index f2b6537..59244a6 100644
--- a/Plugin/Widget/Controller/Adminhtml/Widget/LoadOptions.php
+++ b/Plugin/Widget/Controller/Adminhtml/Widget/LoadOptions.php
@@ -72,7 +72,7 @@ public function aroundExecute(
                         if (isset($request['values']['conditions_encoded'])) {
                             $conditions = $this->getConditionsHelper()->decode($request['values']['conditions_encoded']);
                             $conditions = array_map(function ($condition) {
-                                $questionLists = $condition['question_lists'];
+                                $questionLists = $condition['question_lists'] ?? [];
                                 $newQuestionLists = array_map(function($item) {
                                     if ($this->advancedWidgetHelper->isBase64($item['question_answer'])){
                                         $item['question_answer'] = base64_decode($item['question_answer']);
diff --git a/composer.json b/composer.json
index b95fa7f..ce153ee 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "jajuma/hyva-faq",
     "description": "FAQ Widget for Hyvä Themes",
     "type": "magento2-module",
-    "version": "1.1.5",
+    "version": "1.1.6",
     "license": "MIT",
     "authors": [
         {