Merge branch '18.x' into ipd1.1

2023-09-13 03:23:50 -04:00
parent 8b5f957851 4c30e47fea
commit 86b8aaa455
1091 changed files with 130798 additions and 4093 deletions
@@ -62,9 +62,9 @@
      <div class='cols-list template' id="originCols">
        <?php foreach ($cols as $key => $col):?>
        <?php
-        $required  = $col['required'] == 'yes';
-        $fixed     = $col['fixed'];
-        $width     = $col['width'];
+        $required  = zget($col, 'required', 'no') == 'yes';
+        $fixed     = zget($col, 'fixed', 'no');
+        $width     = zget($col, 'width', 'auto');
        $autoWidth = $width == 'auto';
        ?>
        <?php $hidden = ($extra == 'unsetMarket' && $key == 'market') ? 'hidden' : '';?>