Fix bug related to indexing fields when there's fieldsets

dvlpp · Feb 12, 2016 · 615f230 · 615f230
1 parent ba71344
commit 615f230
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/Dvlpp/Sharp/Config/Utils/HasFormTemplateTrait.php b/src/Dvlpp/Sharp/Config/Utils/HasFormTemplateTrait.php
@@ -27,16 +27,19 @@ trait HasFormTemplateTrait
      */
     public function addField($name, $update=true, $creation=true)
     {
+        $this->fields[] = $name;
+
+        end($this->fields);
+        $lastKey = key($this->fields);
+
         if($update) {
-            $this->updateIndexes[] = sizeof($this->fields);
+            $this->updateIndexes[] = $lastKey;
         }
 
         if($creation) {
-            $this->createIndexes[] = sizeof($this->fields);
+            $this->createIndexes[] = $lastKey;
         }
 
-        $this->fields[] = $name;
-
         return $this;
     }
 
@@ -90,6 +93,7 @@ public function fields($mode)
                 $fields[$key] = $item;
             }
         }
+
         return $fields;
 
         // PHP 5.6: we can use ARRAY_FILTER_USE_BOTH