diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/query/QueryPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/query/QueryPluginBase.php index b4421ec..4015ee9 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/query/QueryPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/query/QueryPluginBase.php @@ -131,7 +131,7 @@ public function getLimit() { * @return $group * The group ID generated. */ - function set_where_group($type = 'AND', $group = NULL, $where = 'where') { + public function setWhereGroup($type = 'AND', $group = NULL, $where = 'where') { // Set an alias. $groups = &$this->$where; 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 9534f1d..22cacf0 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 @@ -843,7 +843,7 @@ function add_where($group, $field, $value = NULL, $operator = NULL) { // Check for a group. if (!isset($this->where[$group])) { - $this->set_where_group('AND', $group); + $this->setWhereGroup('AND', $group); } $this->where[$group]['conditions'][] = array( @@ -881,7 +881,7 @@ function add_where_expression($group, $snippet, $args = array()) { // Check for a group. if (!isset($this->where[$group])) { - $this->set_where_group('AND', $group); + $this->setWhereGroup('AND', $group); } $this->where[$group]['conditions'][] = array( @@ -924,7 +924,7 @@ function add_having($group, $field, $value = NULL, $operator = NULL) { // Check for a group. if (!isset($this->having[$group])) { - $this->set_where_group('AND', $group, 'having'); + $this->setWhereGroup('AND', $group, 'having'); } // Add the clause and the args. @@ -962,7 +962,7 @@ public function addHavingExpression($group, $snippet, $args = array()) { // Check for a group. if (!isset($this->having[$group])) { - $this->set_where_group('AND', $group, 'having'); + $this->setWhereGroup('AND', $group, 'having'); } // Add the clause and the args. diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/Drupal/views/ViewExecutable.php index b7b606e..f7c7b26 100644 --- a/core/modules/views/lib/Drupal/views/ViewExecutable.php +++ b/core/modules/views/lib/Drupal/views/ViewExecutable.php @@ -1015,7 +1015,7 @@ public function build($display_id = NULL) { if ($filter_groups) { $this->query->setGroupOperator($filter_groups['operator']); foreach ($filter_groups['groups'] as $id => $operator) { - $this->query->set_where_group($operator, $id); + $this->query->setWhereGroup($operator, $id); } } }