From f6ea9cd2a23d0bb0c71540d13c27b0e31ba6b735 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Wed, 5 Jun 2013 08:22:07 +0100
Subject: [PATCH] Issue #2003238 by nathangervais: Rename Views
summary_argument() to summaryArgument().
---
.../Drupal/views/Plugin/views/argument/ArgumentPluginBase.php | 2 +-
.../views/lib/Drupal/views/Plugin/views/argument/DayDate.php | 2 +-
.../views/lib/Drupal/views/Plugin/views/argument/Formula.php | 2 +-
.../lib/Drupal/views/Plugin/views/argument/ManyToOne.php | 2 +-
.../lib/Drupal/views/Plugin/views/argument/MonthDate.php | 2 +-
.../views/lib/Drupal/views/Plugin/views/argument/String.php | 2 +-
core/modules/views/views.theme.inc | 4 ++--
7 files changed, 8 insertions(+), 8 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 a015395f5a57..66177c2fe117 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
@@ -884,7 +884,7 @@ public function summarySort($order, $by = NULL) {
* @param $data
* The query results for the row.
*/
- function summary_argument($data) {
+ public function summaryArgument($data) {
return $data->{$this->base_alias};
}
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/DayDate.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/DayDate.php
index 861270384b75..c06a149c33e7 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/DayDate.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/DayDate.php
@@ -43,7 +43,7 @@ function title() {
return format_date(strtotime("2005" . "05" . $day . " 00:00:00 UTC"), 'custom', $this->format, 'UTC');
}
- function summary_argument($data) {
+ public function summaryArgument($data) {
// Make sure the argument contains leading zeroes.
return str_pad($data->{$this->base_alias}, 2, '0', STR_PAD_LEFT);
}
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 89adc6b7ce80..e74ae6fe1e6c 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
@@ -14,7 +14,7 @@
/**
* Abstract argument handler for simple formulae.
*
- * Child classes of this object should implement summary_argument, at least.
+ * Child classes of this object should implement summaryArgument, at least.
*
* Definition terms:
* - formula: The formula to use for this handler.
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
index 6074790f30f0..c89cd0ba437b 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
@@ -184,7 +184,7 @@ function summary_query() {
return $this->summaryBasics();
}
- function summary_argument($data) {
+ public function summaryArgument($data) {
$value = $data->{$this->base_alias};
if (empty($value)) {
$value = 0;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/MonthDate.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/MonthDate.php
index 1981157efb0f..2283c4cac84e 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/MonthDate.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/MonthDate.php
@@ -42,7 +42,7 @@ function title() {
return format_date(strtotime("2005" . $month . "15" . " 00:00:00 UTC"), 'custom', $this->format, 'UTC');
}
- function summary_argument($data) {
+ public function summaryArgument($data) {
// Make sure the argument contains leading zeroes.
return str_pad($data->{$this->base_alias}, 2, '0', STR_PAD_LEFT);
}
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 44bde0d54bb4..cae4bb42aae5 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
@@ -241,7 +241,7 @@ public function query($group_by = FALSE) {
}
}
- function summary_argument($data) {
+ public function summaryArgument($data) {
$value = $this->caseTransform($data->{$this->base_alias}, $this->options['path_case']);
if (!empty($this->options['transform_dash'])) {
$value = strtr($value, ' ', '-');
diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index 680702a6e29b..40ff1d5c2e15 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -433,7 +433,7 @@ function template_preprocess_views_view_summary(&$vars) {
$row_args = array();
foreach ($vars['rows'] as $id => $row) {
- $row_args[$id] = $argument->summary_argument($row);
+ $row_args[$id] = $argument->summaryArgument($row);
}
$argument->process_summary_arguments($row_args);
@@ -493,7 +493,7 @@ function template_preprocess_views_view_summary_unformatted(&$vars) {
// this could cause performance problems.
$row_args = array();
foreach ($vars['rows'] as $id => $row) {
- $row_args[$id] = $argument->summary_argument($row);
+ $row_args[$id] = $argument->summaryArgument($row);
}
$argument->process_summary_arguments($row_args);
--
GitLab