Commit 1cca899 1 parent cb9305a commit 1cca899 Copy full SHA for 1cca899
File tree 3 files changed +18
-1
lines changed
app/code/core/Mage/Adminhtml
tests/unit/Mage/Adminhtml/Block/Widget
3 files changed +18
-1
lines changed Original file line number Diff line number Diff line change @@ -345,7 +345,10 @@ public function addColumnDefaultData(array $column): array
345
345
{
346
346
$ config = $ this ->getConfigDefaultColumnSettings ();
347
347
$ columnHasIndex = array_key_exists ('index ' , $ column );
348
- if ($ columnHasIndex && array_key_exists ($ column ['index ' ], $ config ['index ' ])) {
348
+ if ($ columnHasIndex &&
349
+ !is_array ($ column ['index ' ]) &&
350
+ array_key_exists ($ column ['index ' ], $ config ['index ' ])
351
+ ) {
349
352
$ column += $ config ['index ' ][$ column ['index ' ]];
350
353
}
351
354
Original file line number Diff line number Diff line change 267
267
<sortable >false</sortable >
268
268
<width >40</width >
269
269
</action >
270
+ <concat >
271
+ <separator > </separator >
272
+ </concat >
270
273
<currency >
271
274
<align >right</align >
272
275
<index >price</index >
Original file line number Diff line number Diff line change @@ -72,6 +72,17 @@ public function provideAddColumnDefaultData(): Generator
72
72
'type ' => 'text ' ,
73
73
],
74
74
];
75
+ yield 'index array - ref #4475 ' => [
76
+ [
77
+ 'index ' => ['firstname ' , 'lastname ' ],
78
+ 'type ' => 'concat ' ,
79
+ 'separator ' => ' ' ,
80
+ ],
81
+ [
82
+ 'index ' => ['firstname ' , 'lastname ' ],
83
+ 'type ' => 'concat ' ,
84
+ ],
85
+ ];
75
86
yield 'type action ' => [
76
87
[
77
88
'type ' => 'action ' ,
You can’t perform that action at this time.
0 commit comments