Commit 6feb68f1 authored by alexpott's avatar alexpott
Browse files

Issue #2002980 by Gang Wang, sillygwailo: Rename Views method summary_query() to summaryQuery().

parent 74c3997c
......@@ -780,7 +780,7 @@ protected function defaultSummary() {
// Clear out the normal primary field and whatever else may have
// been added and let the summary do the work.
$this->query->clearFields();
$this->summary_query();
$this->summaryQuery();
$by = $this->options['summary']['number_of_records'] ? 'num_records' : NULL;
$this->summarySort($this->options['summary']['sort_order'], $by);
......@@ -803,7 +803,7 @@ protected function defaultSummary() {
* @return
* The alias used to get the number of records (count) for this entry.
*/
function summary_query() {
protected function summaryQuery() {
$this->ensureMyTable();
// Add the field.
$this->base_alias = $this->query->add_field($this->tableAlias, $this->realField);
......@@ -849,7 +849,7 @@ protected function summaryNameField() {
/**
* Some basic summary behavior that doesn't need to be repeated as much as
* code that goes into summary_query()
* code that goes into summaryQuery()
*/
public function summaryBasics($count_field = TRUE) {
// Add the number of nodes counter
......
......@@ -45,7 +45,7 @@ public function getFormula() {
/**
* Build the summary query based on a formula
*/
function summary_query() {
protected function summaryQuery() {
$this->ensureMyTable();
// Now that our table is secure, get our formula.
$formula = $this->getFormula();
......
......@@ -161,7 +161,7 @@ function title() {
return implode($this->operator == 'or' ? ' + ' : ', ', $this->titleQuery());
}
function summary_query() {
protected function summaryQuery() {
$field = $this->table . '.' . $this->field;
$join = $this->getJoin();
......
......@@ -146,7 +146,7 @@ public function buildOptionsForm(&$form, &$form_state) {
/**
* Build the summary query based on a string
*/
function summary_query() {
protected function summaryQuery() {
if (empty($this->definition['many to one'])) {
$this->ensureMyTable();
}
......
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