From f19b0335ed4a5e961859672820e374d36bdc2d7d Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Tue, 11 Sep 2018 23:37:48 +0200
Subject: [PATCH] Fixed the import of JCB packages, that had an issue of not
 storing multiple list selection values correctly during import.

---
 admin/models/import_joomla_components.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/models/import_joomla_components.php b/admin/models/import_joomla_components.php
index 9cd422f42..f0458d32a 100644
--- a/admin/models/import_joomla_components.php
+++ b/admin/models/import_joomla_components.php
@@ -1451,7 +1451,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 			// convert back to json
 			if ($isJsonTarget)
 			{
-				$item[$target] = json_encode($item[$target]);
+				$item[$target] = json_encode($item[$target], JSON_FORCE_OBJECT);
 			}
 		}
 		elseif (ComponentbuilderHelper::checkObject($item) && isset($item->{$target}))
@@ -1511,7 +1511,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 			// convert back to json
 			if ($isJsonTarget)
 			{
-				$item->{$target} = json_encode($item->{$target});
+				$item->{$target} = json_encode($item->{$target}, JSON_FORCE_OBJECT);
 			}
 		}
 		// return as json if received as json
@@ -2110,7 +2110,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 				if (isset($components) && ComponentbuilderHelper::checkArray($components))
 				{
 					// load it back
-					$item->components = json_encode(array_values($components));
+					$item->components = json_encode(array_values($components), JSON_FORCE_OBJECT);
 				}
 				// merge the translations where needed
 				if (isset($item->translation) && isset($item->localTranslation)