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

Merge branch '4.1' into 4

Browse Source
This commit is contained in:
Daniel Hensby 2018-03-16 14:58:40 +00:00
commit 80d15fc4f5
No known key found for this signature in database
GPG Key ID: D8DEBC4C8E7BC8B9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Forms/FieldList.php
View File

@ -351,7 +351,7 @@ class FieldList extends ArrayList
foreach ($fieldName as $field) {
$this->removeByName($field, $dataFieldOnly);
}
return;
return $this;
}
$this->flushFieldsCache();

2
src/Forms/Form.php
View File

@ -1454,7 +1454,7 @@ class Form extends ViewableData implements HasRequestHandler
$tmpData = &$data[$name];
// drill down into the data array looking for the corresponding value
foreach ($keys as $arrayKey) {
if ($arrayKey !== '') {
if ($tmpData && $arrayKey !== '') {
$tmpData = &$tmpData[$arrayKey];
} else {
//empty square brackets means new array