Merge pull request #2359 from MartijnvAdrichem/bugfix-label-with-name-arrays

tabacitu · web-flow · commit 9f4459c606b7 · 2020-01-20T10:26:49.000+02:00
Fix a bug that caused backpack to crash when a field with an array of names and no label was defined
diff --git a/src/app/Library/CrudPanel/Traits/Fields.php b/src/app/Library/CrudPanel/Traits/Fields.php
@@ -43,7 +43,8 @@ public function addField($field)
 
         // if the label is missing, we should set it
         if (! isset($newField['label'])) {
-            $newField['label'] = mb_ucfirst(str_replace('_', ' ', $newField['name']));
+            $label = is_array($newField['name']) ? $newField['name'][0] : $newField['name'];
+            $newField['label'] = mb_ucfirst(str_replace('_', ' ', $label));
         }
 
         // if the field type is missing, we should set it

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,8 @@ public function addField($field)`
`43`	`43`
`44`	`44`	`// if the label is missing, we should set it`
`45`	`45`	`if (! isset($newField['label'])) {`
`46`		`- $newField['label'] = mb_ucfirst(str_replace('_', ' ', $newField['name']));`
	`46`	`+ $label = is_array($newField['name']) ? $newField['name'][0] : $newField['name'];`
	`47`	`+ $newField['label'] = mb_ucfirst(str_replace('_', ' ', $label));`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`// if the field type is missing, we should set it`