From 347a739b115fefa0c4acc3b3d42ac1aa484d2fdd Mon Sep 17 00:00:00 2001 From: Lucas D Hedding Date: Tue, 11 Jun 2013 07:42:46 -0500 Subject: [PATCH] Issue #2003438 by trevjs: Rename Views method operator_form() to operatorForm() . --- .../node/lib/Drupal/node/Plugin/views/filter/Access.php | 2 +- .../node/lib/Drupal/node/Plugin/views/filter/Status.php | 2 +- .../lib/Drupal/search/Plugin/views/filter/Search.php | 2 +- .../Drupal/views/Plugin/views/filter/BooleanOperator.php | 2 +- .../Drupal/views/Plugin/views/filter/FilterPluginBase.php | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/filter/Access.php b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Access.php index c7b7f7b..b5bf773 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/filter/Access.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Access.php @@ -20,7 +20,7 @@ class Access extends FilterPluginBase { public function adminSummary() { } - function operator_form(&$form, &$form_state) { } + protected function operatorForm(&$form, &$form_state) { } public function canExpose() { return FALSE; } diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/filter/Status.php b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Status.php index 3ae361e..8c2640a 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/filter/Status.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Status.php @@ -21,7 +21,7 @@ class Status extends FilterPluginBase { public function adminSummary() { } - function operator_form(&$form, &$form_state) { } + protected function operatorForm(&$form, &$form_state) { } public function canExpose() { return FALSE; } diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php b/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php index 4ebe91b..5c1c99f 100644 --- a/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php +++ b/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php @@ -48,7 +48,7 @@ protected function defineOptions() { /** * Provide simple equality operator */ - function operator_form(&$form, &$form_state) { + protected function operatorForm(&$form, &$form_state) { $form['operator'] = array( '#type' => 'radios', '#title' => t('On empty input'), 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 72f3814..dfdd23b 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 @@ -96,7 +96,7 @@ protected function defineOptions() { return $options; } - function operator_form(&$form, &$form_state) { + protected function operatorForm(&$form, &$form_state) { $form['operator'] = array(); } 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 8a943ce..d207eca 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 @@ -216,7 +216,7 @@ public function buildOptionsForm(&$form, &$form_state) { } } else { - // Add the subform from operator_form(). + // Add the subform from operatorForm(). $this->showOperatorForm($form, $form_state); // Add the subform from valueForm(). $this->showValueForm($form, $form_state); @@ -266,7 +266,7 @@ public function submitOptionsForm(&$form, &$form_state) { * Shortcut to display the operator form. */ public function showOperatorForm(&$form, &$form_state) { - $this->operator_form($form, $form_state); + $this->operatorForm($form, $form_state); $form['operator']['#prefix'] = '
'; $form['operator']['#suffix'] = '
'; } @@ -279,7 +279,7 @@ public function showOperatorForm(&$form, &$form_state) { * * @see buildOptionsForm() */ - function operator_form(&$form, &$form_state) { + protected function operatorForm(&$form, &$form_state) { $options = $this->operatorOptions(); if (!empty($options)) { $form['operator'] = array( @@ -293,7 +293,7 @@ function operator_form(&$form, &$form_state) { /** * Provide a list of options for the default operator form. - * Should be overridden by classes that don't override operator_form + * Should be overridden by classes that don't override operatorForm */ public function operatorOptions() { return array(); } @@ -787,7 +787,7 @@ public function buildExposedForm(&$form, &$form_state) { // Build the exposed form, when its based on an operator. if (!empty($this->options['expose']['use_operator']) && !empty($this->options['expose']['operator_id'])) { $operator = $this->options['expose']['operator_id']; - $this->operator_form($form, $form_state); + $this->operatorForm($form, $form_state); $form[$operator] = $form['operator']; if (isset($form[$operator]['#title'])) { @@ -962,7 +962,7 @@ protected function buildExposedFiltersGroupForm(&$form, &$form_state) { // $row acts as a fake form to render each widget in a row. $row = array(); $groups[$item_id] = ''; - $this->operator_form($row, $form_state); + $this->operatorForm($row, $form_state); // Force the operator form to be a select box. Some handlers uses // radios and they occupy a lot of space in a table row. $row['operator']['#type'] = 'select'; -- 1.7.10.4