From d7ef279157f61c8322f07ef8fbf25316fcffa555 Mon Sep 17 00:00:00 2001 From: Alex Pott Date: Tue, 11 Jun 2013 13:52:27 +0100 Subject: [PATCH] Issue #2002500 by fmizzell, jibran: Rename Views method exposed_form_validate() to exposedFormValidate(). --- .../views/Plugin/views/exposed_form/ExposedFormPluginBase.php | 4 ++-- .../lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php | 2 +- .../views/lib/Drupal/views/Plugin/views/pager/SqlBase.php | 2 +- core/modules/views/views.module | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php index dfb8c643cbd..5cea25e6d30 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php @@ -254,9 +254,9 @@ abstract class ExposedFormPluginBase extends PluginBase { } } - function exposed_form_validate(&$form, &$form_state) { + public function exposedFormValidate(&$form, &$form_state) { if (isset($form_state['pager_plugin'])) { - $form_state['pager_plugin']->exposed_form_validate($form, $form_state); + $form_state['pager_plugin']->exposedFormValidate($form, $form_state); } } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php index 43545fe6267..74f3219bec6 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php @@ -241,7 +241,7 @@ abstract class PagerPluginBase extends PluginBase { public function exposedFormAlter(&$form, &$form_state) { } - function exposed_form_validate(&$form, &$form_state) { } + public function exposedFormValidate(&$form, &$form_state) { } public function exposedFormSubmit(&$form, &$form_state, &$exclude) { } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.php index 79020a9b74b..93dc80c63fe 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.php @@ -366,7 +366,7 @@ abstract class SqlBase extends PagerPluginBase { } } - function exposed_form_validate(&$form, &$form_state) { + public function exposedFormValidate(&$form, &$form_state) { if (!empty($form_state['values']['offset']) && trim($form_state['values']['offset'])) { if (!is_numeric($form_state['values']['offset']) || $form_state['values']['offset'] < 0) { form_set_error('offset', t('Offset must be an number greather or equal than 0.')); diff --git a/core/modules/views/views.module b/core/modules/views/views.module index 6822bde2503..d755506b2a8 100644 --- a/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -1454,7 +1454,7 @@ function views_exposed_form_validate(&$form, &$form_state) { } } $exposed_form_plugin = $form_state['exposed_form_plugin']; - $exposed_form_plugin->exposed_form_validate($form, $form_state); + $exposed_form_plugin->exposedFormValidate($form, $form_state); } /**