From 7731380b6b9b8c702bf235dd2e83a8e371cfa999 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Wed, 5 Jun 2013 08:37:31 +0100
Subject: [PATCH] Issue #2002930 by marlatt, markie: Rename Views method
value_validate() to valueValidate().
---
.../Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php | 2 +-
.../modules/user/lib/Drupal/user/Plugin/views/filter/Name.php | 2 +-
.../lib/Drupal/views/Plugin/views/filter/BooleanOperator.php | 2 +-
.../lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php | 4 ++--
4 files changed, 5 insertions(+), 5 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 1134d6057f55..8e0c48f00704 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
@@ -211,7 +211,7 @@ protected function valueForm(&$form, &$form_state) {
}
}
- function value_validate($form, &$form_state) {
+ protected function valueValidate($form, &$form_state) {
// We only validate if they've chosen the text field style.
if ($this->options['type'] != 'textfield') {
return;
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php
index 326976268b7c..d9ce0359a6c4 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php
@@ -50,7 +50,7 @@ protected function valueForm(&$form, &$form_state) {
}
}
- function value_validate($form, &$form_state) {
+ protected function valueValidate($form, &$form_state) {
$values = drupal_explode_tags($form_state['values']['options']['value']);
$uids = $this->validate_user_strings($form['value'], $values);
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php
index 5241a0487b9e..8ef336a10176 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php
@@ -135,7 +135,7 @@ protected function valueForm(&$form, &$form_state) {
}
}
- function value_validate($form, &$form_state) {
+ protected function valueValidate($form, &$form_state) {
if ($form_state['values']['options']['value'] == 'All' && !empty($form_state['values']['options']['expose']['required'])) {
form_set_error('value', t('You must select a value unless this is an non-required exposed filter.'));
}
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
index 229f6d6ca0e2..d0dd187411c3 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
@@ -235,7 +235,7 @@ public function buildOptionsForm(&$form, &$form_state) {
*/
public function validateOptionsForm(&$form, &$form_state) {
$this->operator_validate($form, $form_state);
- $this->value_validate($form, $form_state);
+ $this->valueValidate($form, $form_state);
if (!empty($this->options['exposed']) && !$this->isAGroup()) {
$this->validateExposeForm($form, $form_state);
}
@@ -332,7 +332,7 @@ protected function valueForm(&$form, &$form_state) { $form['value'] = array(); }
/**
* Validate the options form.
*/
- function value_validate($form, &$form_state) { }
+ protected function valueValidate($form, &$form_state) { }
/**
* Perform any necessary changes to the form values prior to storage.
--
GitLab