Commit 9048d3b2 authored by alexpott's avatar alexpott
Browse files

Issue #2003270 by markie, Dan Reinders, jibran: Rename Views method...

Issue #2003270 by markie, Dan Reinders, jibran: Rename Views method set_where_group() to setWhereGroup().
parent 52befbe4
......@@ -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;
......
......@@ -843,7 +843,7 @@ public function addWhere($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(
......@@ -918,7 +918,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.
......
......@@ -1018,7 +1018,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);
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment