Merge branch '4.0' into 4.1

This commit is contained in:
Daniel Hensby 2018-03-16 14:57:05 +00:00
commit 9ed3cd4042
No known key found for this signature in database
GPG Key ID: D8DEBC4C8E7BC8B9

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