diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/style/EntityReference.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/style/EntityReference.php index e2df530..4b054a3 100644 --- a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/style/EntityReference.php +++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/style/EntityReference.php @@ -78,7 +78,7 @@ public function render() { } // Group the rows according to the grouping field, if specified. - $sets = $this->render_grouping($this->view->result, $this->options['grouping']); + $sets = $this->renderGrouping($this->view->result, $this->options['grouping']); // Grab the alias of the 'id' field added by // entity_reference_plugin_display. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php index 2fe7cfa..8409c9d 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php @@ -420,7 +420,7 @@ function render() { } // Group the rows according to the grouping instructions, if specified. - $sets = $this->render_grouping( + $sets = $this->renderGrouping( $this->view->result, $this->options['grouping'], TRUE @@ -519,7 +519,7 @@ function render_grouping_sets($sets, $level = 0) { * ) * @endcode */ - function render_grouping($records, $groupings = array(), $group_rendered = NULL) { + public function renderGrouping($records, $groupings = array(), $group_rendered = NULL) { // This is for backward compability, when $groupings was a string containing // the ID of a single field. if (is_string($groupings)) { diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php index f567068..9793810 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php @@ -191,13 +191,13 @@ function _testGrouping($stripped = FALSE) { // The newer api passes the value of the grouping as well. - $sets_new_rendered = $view->style_plugin->render_grouping($view->result, $view->style_plugin->options['grouping'], TRUE); + $sets_new_rendered = $view->style_plugin->renderGrouping($view->result, $view->style_plugin->options['grouping'], TRUE); $this->assertEqual($sets_new_rendered, $expected, t('The style plugins should proper group the results with grouping by the rendered output.')); // Don't test stripped case, because the actual value is not stripped. if (!$stripped) { - $sets_new_value = $view->style_plugin->render_grouping($view->result, $view->style_plugin->options['grouping'], FALSE); + $sets_new_value = $view->style_plugin->renderGrouping($view->result, $view->style_plugin->options['grouping'], FALSE); // Reorder the group structure to grouping by value. $expected['Singer'] = $expected['Job: Singer'];