File tree Expand file tree Collapse file tree 3 files changed +18
-1
lines changed
app/code/core/Mage/Adminhtml
tests/unit/Mage/Adminhtml/Block/Widget Expand file tree Collapse file tree 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
345345 {
346346 $ config = $ this ->getConfigDefaultColumnSettings ();
347347 $ 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+ ) {
349352 $ column += $ config ['index ' ][$ column ['index ' ]];
350353 }
351354
Original file line number Diff line number Diff line change 267267 <sortable >false</sortable >
268268 <width >40</width >
269269 </action >
270+ <concat >
271+ <separator > </separator >
272+ </concat >
270273 <currency >
271274 <align >right</align >
272275 <index >price</index >
Original file line number Diff line number Diff line change @@ -72,6 +72,17 @@ public function provideAddColumnDefaultData(): Generator
7272 'type ' => 'text ' ,
7373 ],
7474 ];
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+ ];
7586 yield 'type action ' => [
7687 [
7788 'type ' => 'action ' ,
You can’t perform that action at this time.
0 commit comments