summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2013-05-29 06:05:02 (GMT)
committerAlex Pott2013-05-29 06:05:02 (GMT)
commita2b14f1212358f901744960c05a669ca32e23bef (patch)
tree8bd3162c821c27c550ac1811fa48debbbd2e6eec
parentb5411b1fc619922401b4f6213c4ba925438bc2c3 (diff)
Issue #2003364 by Sam Moore: Rename Views method prepare_filter_select_options() to prepareFilterSelectOptions().
-rw-r--r--core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php8
1 files changed, 4 insertions, 4 deletions
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 f8a30d8..2d43c96 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
@@ -1130,7 +1130,7 @@ abstract class FilterPluginBase extends HandlerBase {
// Cleanup in case the translated element's (radios or checkboxes) display value contains html.
if ($form['#type'] == 'select') {
- $this->prepare_filter_select_options($form['#options']);
+ $this->prepareFilterSelectOptions($form['#options']);
}
if ($type == 'value' && empty($this->always_required) && empty($this->options['expose']['required']) && $form['#type'] == 'select' && empty($form['#multiple'])) {
@@ -1151,16 +1151,16 @@ abstract class FilterPluginBase extends HandlerBase {
*
* The function is recursive to support optgroups.
*/
- function prepare_filter_select_options(&$options) {
+ protected function prepareFilterSelectOptions(&$options) {
foreach ($options as $value => $label) {
// Recurse for optgroups.
if (is_array($label)) {
- $this->prepare_filter_select_options($options[$value]);
+ $this->prepareFilterSelectOptions($options[$value]);
}
// FAPI has some special value to allow hierarchy.
// @see _form_options_flatten
elseif (is_object($label)) {
- $this->prepare_filter_select_options($options[$value]->option);
+ $this->prepareFilterSelectOptions($options[$value]->option);
}
else {
$options[$value] = strip_tags(decode_entities($label));