Commit a2b14f12 authored by alexpott's avatar alexpott

Issue #2003364 by Sam Moore: Rename Views method...

Issue #2003364 by Sam Moore: Rename Views method prepare_filter_select_options() to prepareFilterSelectOptions().
parent b5411b1f
......@@ -1130,7 +1130,7 @@ protected function exposedTranslate(&$form, $type) {
// 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 @@ protected function exposedTranslate(&$form, $type) {
*
* 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));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment