Commit 7731380b authored by alexpott's avatar alexpott
Browse files

Issue #2002930 by marlatt, markie: Rename Views method value_validate() to valueValidate().

parent d72064fa
...@@ -211,7 +211,7 @@ protected function valueForm(&$form, &$form_state) { ...@@ -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. // We only validate if they've chosen the text field style.
if ($this->options['type'] != 'textfield') { if ($this->options['type'] != 'textfield') {
return; return;
......
...@@ -50,7 +50,7 @@ protected function valueForm(&$form, &$form_state) { ...@@ -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']); $values = drupal_explode_tags($form_state['values']['options']['value']);
$uids = $this->validate_user_strings($form['value'], $values); $uids = $this->validate_user_strings($form['value'], $values);
......
...@@ -135,7 +135,7 @@ protected function valueForm(&$form, &$form_state) { ...@@ -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'])) { 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.')); form_set_error('value', t('You must select a value unless this is an non-required exposed filter.'));
} }
......
...@@ -235,7 +235,7 @@ public function buildOptionsForm(&$form, &$form_state) { ...@@ -235,7 +235,7 @@ public function buildOptionsForm(&$form, &$form_state) {
*/ */
public function validateOptionsForm(&$form, &$form_state) { public function validateOptionsForm(&$form, &$form_state) {
$this->operator_validate($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()) { if (!empty($this->options['exposed']) && !$this->isAGroup()) {
$this->validateExposeForm($form, $form_state); $this->validateExposeForm($form, $form_state);
} }
...@@ -332,7 +332,7 @@ protected function valueForm(&$form, &$form_state) { $form['value'] = array(); } ...@@ -332,7 +332,7 @@ protected function valueForm(&$form, &$form_state) { $form['value'] = array(); }
/** /**
* Validate the options form. * 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. * Perform any necessary changes to the form values prior to storage.
......
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