From 1c619029245a8eb54144c2f6587c3e61d23babeb Mon Sep 17 00:00:00 2001 From: Alex Pott Date: Wed, 29 May 2013 06:57:33 +0100 Subject: [PATCH] Issue #2003352 by ericthelast: Rename Views method() to reduceValueOptions(). --- .../taxonomy/Plugin/views/filter/TaxonomyIndexTid.php | 2 +- .../lib/Drupal/views/Plugin/views/filter/InOperator.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php index f485ac692c8..e791f8965f6 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php @@ -165,7 +165,7 @@ class TaxonomyIndexTid extends ManyToOne { $identifier = $this->options['expose']['identifier']; if (!empty($this->options['expose']['reduce'])) { - $options = $this->reduce_value_options($options); + $options = $this->reduceValueOptions($options); if (!empty($this->options['expose']['multiple']) && empty($this->options['expose']['required'])) { $default_value = array(); diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php index dfe89ea7573..f8b6c6ba58d 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php @@ -193,7 +193,7 @@ class InOperator extends FilterPluginBase { } if (!empty($this->options['expose']['reduce'])) { - $options = $this->reduce_value_options(); + $options = $this->reduceValueOptions(); if (!empty($this->options['expose']['multiple']) && empty($this->options['expose']['required'])) { $default_value = array(); @@ -247,7 +247,7 @@ class InOperator extends FilterPluginBase { /** * When using exposed filters, we may be required to reduce the set. */ - function reduce_value_options($input = NULL) { + public function reduceValueOptions($input = NULL) { if (!isset($input)) { $input = $this->value_options; } @@ -258,7 +258,7 @@ class InOperator extends FilterPluginBase { $options = array(); foreach ($input as $id => $option) { if (is_array($option)) { - $options[$id] = $this->reduce_value_options($option); + $options[$id] = $this->reduceValueOptions($option); continue; } elseif (is_object($option)) {