Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2003364 by Sam Moore: Rename Views method prepare_filter_select_options() to prepareFilterSelectOptions().

8.0.x
Alex Pott 2013-05-29 07:05:02 +01:00
parent b5411b1fc6
commit a2b14f1212
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
View File

@ -1130,7 +1130,7 @@ abstract class FilterPluginBase extends HandlerBase {
// Cleanup in case the translated element's (radios or checkboxes) display value contains html. // Cleanup in case the translated element's (radios or checkboxes) display value contains html.
if ($form['#type'] == 'select') { 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'])) { 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. * The function is recursive to support optgroups.
*/ */
function prepare_filter_select_options(&$options) { protected function prepareFilterSelectOptions(&$options) {
foreach ($options as $value => $label) { foreach ($options as $value => $label) {
// Recurse for optgroups. // Recurse for optgroups.
if (is_array($label)) { if (is_array($label)) {
$this->prepare_filter_select_options($options[$value]); $this->prepareFilterSelectOptions($options[$value]);
} }
// FAPI has some special value to allow hierarchy. // FAPI has some special value to allow hierarchy.
// @see _form_options_flatten // @see _form_options_flatten
elseif (is_object($label)) { elseif (is_object($label)) {
$this->prepare_filter_select_options($options[$value]->option); $this->prepareFilterSelectOptions($options[$value]->option);
} }
else { else {
$options[$value] = strip_tags(decode_entities($label)); $options[$value] = strip_tags(decode_entities($label));