tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

FIX: Ensure FieldList::push() doesn't eliminate key

Browse Source
This commit is contained in:
Will Rossiter 2013-04-06 19:16:59 +13:00
parent b25eda83c4
commit 69722222b4
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
forms/FieldList.php
View File

@ -402,7 +402,8 @@ class FieldList extends ArrayList {
public function push($item, $key = null) { public function push($item, $key = null) {
$this->onBeforeInsert($item); $this->onBeforeInsert($item);
$item->setContainerFieldList($this); $item->setContainerFieldList($this);
return parent::push($item, $key = null);
return parent::push($item, $key);
} }
/** /**
@ -410,7 +411,10 @@ class FieldList extends ArrayList {
*/ */
protected function onBeforeInsert($item) { protected function onBeforeInsert($item) {
$this->flushFieldsCache(); $this->flushFieldsCache();
if($item->getName()) $this->rootFieldList()->removeByName($item->getName(), true);
if($item->getName()) {
$this->rootFieldList()->removeByName($item->getName(), true);
}
} }
@ -420,7 +424,10 @@ class FieldList extends ArrayList {
* @param Form $form The form to set this FieldList to * @param Form $form The form to set this FieldList to
*/ */
public function setForm($form) { public function setForm($form) {
foreach($this as $field) $field->setForm($form); foreach($this as $field) {
$field->setForm($form);
}
return $this; return $this;
} }