From c481e2fdbe64bc5c09b7bc662dbff80d29222507 Mon Sep 17 00:00:00 2001 From: Alex Pott Date: Wed, 5 Jun 2013 08:35:33 +0100 Subject: [PATCH] Issue #2002496 by baldwinlouie: Rename Views method exposed_form_alter() to exposedFormAlter(). --- .../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 c292af06074c..dfb8c643cbd0 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 @@ -182,7 +182,7 @@ abstract class ExposedFormPluginBase extends PluginBase { public function postExecute() { } - function exposed_form_alter(&$form, &$form_state) { + public function exposedFormAlter(&$form, &$form_state) { $form['submit']['#value'] = $this->options['submit_button']; // Check if there is exposed sorts for this view $exposed_sorts = array(); @@ -249,7 +249,7 @@ abstract class ExposedFormPluginBase extends PluginBase { $pager = $this->view->display_handler->getPlugin('pager'); if ($pager) { - $pager->exposed_form_alter($form, $form_state); + $pager->exposedFormAlter($form, $form_state); $form_state['pager_plugin'] = $pager; } } 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 916716fd53bd..17ca34196bbf 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 @@ -239,7 +239,7 @@ abstract class PagerPluginBase extends PluginBase { && $this->total_items > (intval($this->current_page) + 1) * $this->get_items_per_page(); } - function exposed_form_alter(&$form, &$form_state) { } + public function exposedFormAlter(&$form, &$form_state) { } function exposed_form_validate(&$form, &$form_state) { } 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 40acc54b89ac..0bc674e8be0b 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 @@ -335,7 +335,7 @@ abstract class SqlBase extends PagerPluginBase { return !empty($this->options['expose']['offset']); } - function exposed_form_alter(&$form, &$form_state) { + public function exposedFormAlter(&$form, &$form_state) { if ($this->itemsPerPageExposed()) { $options = explode(',', $this->options['expose']['items_per_page_options']); $sanitized_options = array(); diff --git a/core/modules/views/views.module b/core/modules/views/views.module index f3aab61b733a..945e7d9e1518 100644 --- a/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -1416,7 +1416,7 @@ function views_exposed_form($form, &$form_state) { // $form['#attributes']['class'] = array('views-exposed-form'); $exposed_form_plugin = $form_state['exposed_form_plugin']; - $exposed_form_plugin->exposed_form_alter($form, $form_state); + $exposed_form_plugin->exposedFormAlter($form, $form_state); // Save the form views_exposed_form_cache($view->storage->id(), $view->current_display, $form);