Skip to content

Commit b9f8274

Browse files
committed
Use the un-prefixed name for callbacks and values
1 parent 2570e3c commit b9f8274

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/ManyField.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,8 @@ public function FieldList() {
534534
}
535535

536536
protected function updateManyNestedField($field, $index, $value, $prefixName) {
537+
$name = $field->name;
538+
537539
if ($prefixName) {
538540
$field->name = $this->name . '['.$field->name . ']['. $index . ']';
539541
}
@@ -547,20 +549,19 @@ protected function updateManyNestedField($field, $index, $value, $prefixName) {
547549
}
548550
}
549551
} 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);
553554
} else if (is_object($value)) {
554-
$field->setValue($value->{$field->name}, $value);
555+
$field->setValue($value->{$name}, $value);
555556
} 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);
557558
} else {
558559
$field->setValue($value);
559560
}
560561
}
561562

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) {
564565
call_user_func($cb, $field, $index, $this, $value);
565566
}
566567
}
@@ -591,7 +592,6 @@ public function generateRow($index, $value = null, $prefixName = true)
591592
$field = clone $child;
592593
$field = $this->updateManyNestedField($field, $index, $value, $prefixName);
593594

594-
595595
$row->push($field);
596596
}
597597

0 commit comments

Comments
 (0)