@@ -534,6 +534,8 @@ public function FieldList() {
534
534
}
535
535
536
536
protected function updateManyNestedField ($ field , $ index , $ value , $ prefixName ) {
537
+ $ name = $ field ->name ;
538
+
537
539
if ($ prefixName ) {
538
540
$ field ->name = $ this ->name . '[ ' .$ field ->name . '][ ' . $ index . '] ' ;
539
541
}
@@ -547,20 +549,19 @@ protected function updateManyNestedField($field, $index, $value, $prefixName) {
547
549
}
548
550
}
549
551
} else {
550
-
551
- if ($ value && $ value ->hasMethod ($ field ->Name )) {
552
- $ field ->setValue ($ value ->{$ field ->name }(), $ value );
552
+ if ($ value && $ value ->hasMethod ($ name )) {
553
+ $ field ->setValue ($ value ->{$ name }(), $ value );
553
554
} else if (is_object ($ value )) {
554
- $ field ->setValue ($ value ->{$ field -> name }, $ value );
555
+ $ field ->setValue ($ value ->{$ name }, $ value );
555
556
} else if (is_array ($ value )) {
556
- $ field ->setValue ((isset ($ value [$ field -> name ])) ? $ value [$ field -> name ] : null );
557
+ $ field ->setValue ((isset ($ value [$ name ])) ? $ value [$ name ] : null );
557
558
} else {
558
559
$ field ->setValue ($ value );
559
560
}
560
561
}
561
562
562
- if (isset ($ this ->fieldCallbacks [$ field -> name ])) {
563
- foreach ($ this ->fieldCallbacks [$ field -> name ] as $ cb ) {
563
+ if (isset ($ this ->fieldCallbacks [$ name ])) {
564
+ foreach ($ this ->fieldCallbacks [$ name ] as $ cb ) {
564
565
call_user_func ($ cb , $ field , $ index , $ this , $ value );
565
566
}
566
567
}
@@ -591,7 +592,6 @@ public function generateRow($index, $value = null, $prefixName = true)
591
592
$ field = clone $ child ;
592
593
$ field = $ this ->updateManyNestedField ($ field , $ index , $ value , $ prefixName );
593
594
594
-
595
595
$ row ->push ($ field );
596
596
}
597
597
0 commit comments