From 7fbe420e89b931d576b926cb7319ad86180091f6 Mon Sep 17 00:00:00 2001
From: Lucas D Hedding <lucashedding@1463982.no-reply.drupal.org>
Date: Fri, 14 Jun 2013 08:11:07 -0500
Subject: [PATCH] Issue #2003304 by jibran, gdf, Dan Reinders: Rename Views
 method set_count_field() to setCountField().

---
 .../lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php  |    4 ++--
 .../views/lib/Drupal/views/Plugin/views/argument/Formula.php       |    2 +-
 .../views/lib/Drupal/views/Plugin/views/argument/String.php        |    4 ++--
 core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php     |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
index 3f5ae44..b7c8964 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
@@ -798,7 +798,7 @@ protected function defaultSummary() {
    * - addGroupBy: group on this field in order to create summaries.
    * - addField: add a 'num_nodes' field for the count. Usually it will
    *   be a count on $view->base_field
-   * - set_count_field: Reset the count field so we get the right paging.
+   * - setCountField: Reset the count field so we get the right paging.
    *
    * @return
    *   The alias used to get the number of records (count) for this entry.
@@ -859,7 +859,7 @@ public function summaryBasics($count_field = TRUE) {
     $this->query->addGroupBy($this->name_alias);
 
     if ($count_field) {
-      $this->query->set_count_field($this->tableAlias, $this->realField);
+      $this->query->setCountField($this->tableAlias, $this->realField);
     }
 
     $this->count_alias = $count_alias;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Formula.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Formula.php
index 0e10708..07c9ff5 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Formula.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Formula.php
@@ -52,7 +52,7 @@ protected function summaryQuery() {
 
     // Add the field.
     $this->base_alias = $this->name_alias = $this->query->addField(NULL, $formula, $this->field);
-    $this->query->set_count_field(NULL, $formula, $this->field);
+    $this->query->setCountField(NULL, $formula, $this->field);
 
     return $this->summaryBasics(FALSE);
   }
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php
index 0fd1082..d96f033 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php
@@ -157,13 +157,13 @@ protected function summaryQuery() {
     if (empty($this->options['glossary'])) {
       // Add the field.
       $this->base_alias = $this->query->addField($this->tableAlias, $this->realField);
-      $this->query->set_count_field($this->tableAlias, $this->realField);
+      $this->query->setCountField($this->tableAlias, $this->realField);
     }
     else {
       // Add the field.
       $formula = $this->getFormula();
       $this->base_alias = $this->query->addField(NULL, $formula, $this->field . '_truncated');
-      $this->query->set_count_field(NULL, $formula, $this->field, $this->field . '_truncated');
+      $this->query->setCountField(NULL, $formula, $this->field, $this->field . '_truncated');
     }
 
     $this->summaryNameField();
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 2efb213..61fd815 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
@@ -160,7 +160,7 @@ protected function setDistinct($value = TRUE) {
   /**
    * Set what field the query will count() on for paging.
    */
-  function set_count_field($table, $field, $alias = NULL) {
+  public function setCountField($table, $field, $alias = NULL) {
     if (empty($alias)) {
       $alias = $table . '_' . $field;
     }
-- 
1.7.10.4