From 15d26abb0f600b40f2c9b51b8c63a60bccaf697f Mon Sep 17 00:00:00 2001 From: Alex Pott Date: Thu, 30 May 2013 00:49:15 +0100 Subject: [PATCH] Issue #2003346 by JimSmith: Rename Views method render_exposed_form() to renderExposedForm(). --- .../lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php | 2 +- .../views/Plugin/views/exposed_form/ExposedFormPluginBase.php | 2 +- .../views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php | 2 +- core/modules/views/lib/Drupal/views/ViewExecutable.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php index 519ae144148..7f6b10487ee 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php @@ -2704,7 +2704,7 @@ abstract class DisplayPluginBase extends PluginBase { if ($this->usesExposed() && $this->getOption('exposed_block')) { $exposed_form = $this->getPlugin('exposed_form'); - return $exposed_form->render_exposed_form(TRUE); + return $exposed_form->renderExposedForm(TRUE); } } 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 741cf66e379..b9999d46628 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 @@ -115,7 +115,7 @@ abstract class ExposedFormPluginBase extends PluginBase { * also assign data to the appropriate handlers for use in building the * query. */ - function render_exposed_form($block = FALSE) { + public function renderExposedForm($block = FALSE) { // Deal with any exposed filters we may have, before building. $form_state = array( 'view' => &$this->view, diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php index 553d74fed78..e7994f233b8 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php @@ -99,7 +99,7 @@ class ExposedFormTest extends ViewTestBase { $view = views_get_view('test_reset_button'); $this->executeView($view); $exposed_form = $view->display_handler->getPlugin('exposed_form'); - $this->drupalSetContent($exposed_form->render_exposed_form()); + $this->drupalSetContent($exposed_form->renderExposedForm()); $expected_id = drupal_clean_css_identifier('views-exposed-form-' . $view->storage->id() . '-' . $view->current_display); $this->assertFieldByXpath('//form/@id', $expected_id, 'Expected form ID found.'); diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/Drupal/views/ViewExecutable.php index e32c4c0c0be..b7b606e72d3 100644 --- a/core/modules/views/lib/Drupal/views/ViewExecutable.php +++ b/core/modules/views/lib/Drupal/views/ViewExecutable.php @@ -997,7 +997,7 @@ class ViewExecutable { if ($this->display_handler->usesExposed()) { $exposed_form = $this->display_handler->getPlugin('exposed_form'); - $this->exposed_widgets = $exposed_form->render_exposed_form(); + $this->exposed_widgets = $exposed_form->renderExposedForm(); if (form_set_error() || !empty($this->build_info['abort'])) { $this->built = TRUE; // Don't execute the query, but rendering will still be executed to display the empty text.