diff --git a/core/modules/views/lib/Drupal/views/ManyToOneHelper.php b/core/modules/views/lib/Drupal/views/ManyToOneHelper.php index 895eab75ba30..ed60500fac01 100644 --- a/core/modules/views/lib/Drupal/views/ManyToOneHelper.php +++ b/core/modules/views/lib/Drupal/views/ManyToOneHelper.php @@ -86,7 +86,7 @@ class ManyToOneHelper { } // Cycle through the joins. This isn't as error-safe as the normal - // ensure_path logic. Perhaps it should be. + // ensurePath logic. Perhaps it should be. $r_join = clone $join; while ($r_join->leftTable != $base_table) { $r_join = HandlerBase::getTableJoin($r_join->leftTable, $base_table); diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php b/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php index 5c2e8a51ba8d..7555ff47f471 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php @@ -365,7 +365,7 @@ class Sql extends QueryPluginBase { * added. */ public function addTable($table, $relationship = NULL, JoinPluginBase $join = NULL, $alias = NULL) { - if (!$this->ensure_path($table, $relationship, $join)) { + if (!$this->ensurePath($table, $relationship, $join)) { return FALSE; } @@ -545,7 +545,7 @@ class Sql extends QueryPluginBase { // join to a link point, not the base table. $join = $this->adjust_join($join, $relationship); - if ($this->ensure_path($table, $relationship, $join)) { + if ($this->ensurePath($table, $relationship, $join)) { // Attempt to eliminate redundant joins. If this table's // relationship and join exactly matches an existing table's // relationship and join, we do not have to join to it again; @@ -587,7 +587,7 @@ class Sql extends QueryPluginBase { * query they will be added, but additional copies will NOT be added * if the table is already there. */ - function ensure_path($table, $relationship = NULL, $join = NULL, $traced = array(), $add = array()) { + protected function ensurePath($table, $relationship = NULL, $join = NULL, $traced = array(), $add = array()) { if (!isset($relationship)) { $relationship = $this->view->storage->get('base_table'); } @@ -632,7 +632,7 @@ class Sql extends QueryPluginBase { // Keep looking. $traced[$join->leftTable] = TRUE; - return $this->ensure_path($join->leftTable, $relationship, $left_join, $traced, $add); + return $this->ensurePath($join->leftTable, $relationship, $left_join, $traced, $add); } /**