diff --git a/core/modules/field_ui/src/Element/FieldUiTable.php b/core/modules/field_ui/src/Element/FieldUiTable.php index 15dea19..edb6cdd 100644 --- a/core/modules/field_ui/src/Element/FieldUiTable.php +++ b/core/modules/field_ui/src/Element/FieldUiTable.php @@ -8,6 +8,7 @@ namespace Drupal\field_ui\Element; use Drupal\Component\Utility\Html; +use Drupal\Core\Render\Element; use Drupal\Core\Render\Element\Table; /** @@ -25,11 +26,9 @@ public function getInfo() { $class = get_class($this); $parent_class = get_parent_class($this); $info = array( - '#regions' => ['' => []], // Render properties. '#pre_render' => [ ['Drupal\field_ui\Form\EntityDisplayFormBase', 'tablePreRender'], - [$parent_class, 'preRenderTable'], [$class, 'preRenderTable'], ], ) + parent::getInfo(); @@ -79,7 +78,7 @@ public static function preRenderTable($element) { // Render children as table cells. foreach (Element::children($region_element) as $cell_key) { - $child = &$element[$cell_key]; + $child = &$region_element[$cell_key]; // Do not render a cell for children of #type 'value'. if (!(isset($child['#type']) && $child['#type'] == 'value')) { $cell = ['data' => drupal_render($child)]; @@ -92,6 +91,7 @@ public static function preRenderTable($element) { $element['#rows'][] = $row; } } + return $element; } } diff --git a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php index 03574fa..d8258d8 100644 --- a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php +++ b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php @@ -807,7 +807,7 @@ public function tablePreRender($elements) { } // Determine rendering order from the tree structure. foreach ($regions as $region_name => $region) { - $elements['#regions'][$region_name]['rows_order'] = array_reduce($trees[$region_name], array($this, 'reduceOrder')); + $elements['#regions'][$region_name]['rows_order'] = array_reduce($trees[$region_name], array('Drupal\field_ui\Form\EntityDisplayFormBase', 'reduceOrder')); } $elements['#attached']['drupalSettings']['fieldUIRowsData'] = $js_settings; @@ -838,7 +838,7 @@ public function reduceOrder($array, $a) { } if (!empty($a['children'])) { uasort($a['children'], array('Drupal\Component\Utility\SortArray', 'sortByWeightElement')); - $array = array_merge($array, array_reduce($a['children'], array($this, 'reduceOrder'))); + $array = array_merge($array, array_reduce($a['children'], array('Drupal\field_ui\Form\EntityDisplayFormBase', 'reduceOrder'))); } return $array; }