Load the types form when the data is an array

Digital-Peak · Apr 26, 2016 · aeac2e9 · aeac2e9
1 parent 7394178
commit aeac2e9
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/administrator/components/com_fields/models/field.php b/administrator/components/com_fields/models/field.php
@@ -343,14 +343,19 @@ protected function preprocessForm (JForm $form, $data, $group = 'content')
 		{
 			$component = $parts[0];
 
-			if (isset($data->type))
+			$dataObject = $data;
+			if (is_array($dataObject))
 			{
-				$this->loadTypeForms($form, $data->type, $component);
+				$dataObject = (object) $dataObject;
+			}
+			if (isset($dataObject->type))
+			{
+				$this->loadTypeForms($form, $dataObject->type, $component);
 
 				$form->setFieldAttribute('type', 'component', $component);
 
 				// Not alowed to change the type of an existing record
-				if ($data->id)
+				if ($dataObject->id)
 				{
 					$form->setFieldAttribute('type', 'readonly', 'true');
 				}