From cfcbea30c1629dd77ac6c7d4eaab061f3ed8fc44 Mon Sep 17 00:00:00 2001
From: Thierry Bugier <tbugier@teclib.com>
Date: Tue, 28 Jan 2020 17:46:48 +0100
Subject: [PATCH] fix(section): duplication of conditions: bad itemtype

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
---
 inc/condition.class.php | 2 --
 inc/question.class.php  | 8 ++++----
 inc/section.class.php   | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/inc/condition.class.php b/inc/condition.class.php
index c75f24e82..7c3031075 100644
--- a/inc/condition.class.php
+++ b/inc/condition.class.php
@@ -129,7 +129,6 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
          }
       }
       $input['plugin_formcreator_questions_id'] = $linked->getID();
-      $input['itemtype'] = $linked->getType();
 
       // Add or update condition
       $originalId = $input[$idKey];
@@ -177,7 +176,6 @@ public function export($remove_uuid = false) {
          $condition['plugin_formcreator_questions_id'] = $question->fields['uuid'];
       }
       unset($condition[$idToRemove]);
-      unset($condition['itemtype']);
 
       return $condition;
    }
diff --git a/inc/question.class.php b/inc/question.class.php
index 47c0e3e5c..1c7b8cec4 100644
--- a/inc/question.class.php
+++ b/inc/question.class.php
@@ -937,13 +937,13 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
          foreach ($input['_conditions'] as $condition) {
             PluginFormcreatorCondition::import($linker, $condition, $itemId);
          }
-         $field = PluginFormcreatorFields::getFieldInstance(
-            $input['fieldtype'],
-            $item
-         );
       }
 
       // Import parameters
+      $field = PluginFormcreatorFields::getFieldInstance(
+         $input['fieldtype'],
+         $item
+      );
       if (isset($input['_parameters'])) {
          $parameters = $field->getParameters();
          foreach ($parameters as $fieldName => $parameter) {
diff --git a/inc/section.class.php b/inc/section.class.php
index 313077dd0..fed7daee1 100644
--- a/inc/section.class.php
+++ b/inc/section.class.php
@@ -316,7 +316,7 @@ public function export($remove_uuid = false) {
          }
       }
 
-      // get question conditions
+      // get section conditions
       $section['_conditions'] = [];
       $condition = new PluginFormcreatorCondition();
       $all_conditions = $condition->getConditionsFromItem($this);