Commit 1c619029 authored by alexpott's avatar alexpott

Issue #2003352 by ericthelast: Rename Views method() to reduceValueOptions().

parent fe3d8597
...@@ -165,7 +165,7 @@ function value_form(&$form, &$form_state) { ...@@ -165,7 +165,7 @@ function value_form(&$form, &$form_state) {
$identifier = $this->options['expose']['identifier']; $identifier = $this->options['expose']['identifier'];
if (!empty($this->options['expose']['reduce'])) { 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'])) { if (!empty($this->options['expose']['multiple']) && empty($this->options['expose']['required'])) {
$default_value = array(); $default_value = array();
......
...@@ -193,7 +193,7 @@ function value_form(&$form, &$form_state) { ...@@ -193,7 +193,7 @@ function value_form(&$form, &$form_state) {
} }
if (!empty($this->options['expose']['reduce'])) { 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'])) { if (!empty($this->options['expose']['multiple']) && empty($this->options['expose']['required'])) {
$default_value = array(); $default_value = array();
...@@ -247,7 +247,7 @@ function value_form(&$form, &$form_state) { ...@@ -247,7 +247,7 @@ function value_form(&$form, &$form_state) {
/** /**
* When using exposed filters, we may be required to reduce the set. * 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)) { if (!isset($input)) {
$input = $this->value_options; $input = $this->value_options;
} }
...@@ -258,7 +258,7 @@ function reduce_value_options($input = NULL) { ...@@ -258,7 +258,7 @@ function reduce_value_options($input = NULL) {
$options = array(); $options = array();
foreach ($input as $id => $option) { foreach ($input as $id => $option) {
if (is_array($option)) { if (is_array($option)) {
$options[$id] = $this->reduce_value_options($option); $options[$id] = $this->reduceValueOptions($option);
continue; continue;
} }
elseif (is_object($option)) { elseif (is_object($option)) {
......
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