Check $showOnlyThisFields before setting defaults BT#12641

8 years ago · 205587f9ed
parent 3c97672b52
commit 205587f9ed
1 changed files with 12 additions and 1 deletions
--- a/main/inc/lib/extra_field.lib.php
+++ b/main/inc/lib/extra_field.lib.php
@ -476,7 +476,18 @@ class ExtraField extends Model
            $extraData = self::get_handler_extra_data($itemId);

            if ($form) {
-                $form->setDefaults($extraData);
+                if (!empty($showOnlyThisFields)) {
+                    $setData = [];
+                    foreach ($showOnlyThisFields as $variable) {
+                        $extraName = 'extra_'.$variable;
+                        if (in_array($extraName, array_keys($extraData))) {
+                            $setData[$extraName] = $extraData[$extraName];
+                        };
+                    }
+                    $form->setDefaults($setData);
+                } else {
+                    $form->setDefaults($extraData);
+                }
            }
        }